From: Jakub Narebski <jnareb@gmail.com>
To: Don Zickus <dzickus@redhat.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] git-apply doesn't handle same name patches well [V3]
Date: Mon, 16 Jun 2008 13:27:52 -0700 (PDT) [thread overview]
Message-ID: <m3prqhnn0b.fsf@localhost.localdomain> (raw)
In-Reply-To: <1213646686-31964-1-git-send-email-dzickus@redhat.com>
Don Zickus <dzickus@redhat.com> writes:
> When working with a lot of people who backport patches all day long, every
> once in a while I get a patch that modifies the same file more than once
> inside the same patch. git-apply either fails if the second change relies
> on the first change or silently drops the first change if the second change
> is independent.
>
> The silent part is the scary scenario for us. Also this behaviour is
> different from the patch-utils.
>
> I have modified git-apply to cache the filenames of files it modifies such
> that if a later patch chunk modifies a file in the cache it will buffer the
> previously changed file instead of reading the original file from disk.
>
> Logic has been put in to handle creations/deletions/renames/copies. All the
> relevant tests of git-apply succeed.
Very nice, although most probably I would never use this.
+1
--
Jakub Narebski
Poland
ShadeHawk on #git
next prev parent reply other threads:[~2008-06-16 20:28 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-16 20:04 [PATCH] git-apply doesn't handle same name patches well [V3] Don Zickus
2008-06-16 20:27 ` Jakub Narebski [this message]
2008-06-17 9:40 ` Johannes Schindelin
2008-06-18 0:42 ` Junio C Hamano
2008-06-19 21:33 ` Don Zickus
2008-06-19 22:15 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m3prqhnn0b.fsf@localhost.localdomain \
--to=jnareb@gmail.com \
--cc=dzickus@redhat.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).