From: "Mike Ralphson" <mike.ralphson@gmail.com>
To: "Don Zickus" <dzickus@redhat.com>
Cc: git@vger.kernel.org, "Johannes Schindelin" <Johannes.Schindelin@gmx.de>
Subject: Re: [PATCH] git-apply doesn't handle same name patches well
Date: Mon, 16 Jun 2008 10:01:41 +0100 [thread overview]
Message-ID: <e2b179460806160201j133dac0eg37c88b5670541ff8@mail.gmail.com> (raw)
In-Reply-To: <1213376131-20967-1-git-send-email-dzickus@redhat.com>
2008/6/13 Don Zickus <dzickus@redhat.com>:
> 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...
>
> 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.
Excellent spot. A couple of things you might want to add to your new
test cases would be examples where the first patch renames or removes
a file (or two files are swapped) and a subsequent patch then touches
the same path(s).
Mike
prev parent reply other threads:[~2008-06-16 9:02 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-13 16:55 [PATCH] git-apply doesn't handle same name patches well Don Zickus
2008-06-13 20:32 ` Johannes Schindelin
2008-06-13 20:42 ` Don Zickus
2008-06-13 22:48 ` [PATCH] path-list documentation: document all functions and data structures Miklos Vajna
2008-06-13 23:30 ` Olivier Marin
2008-06-14 0:13 ` Miklos Vajna
2008-06-14 0:56 ` Miklos Vajna
2008-06-14 12:50 ` Olivier Marin
2008-06-14 22:50 ` Miklos Vajna
2008-06-14 18:08 ` Johannes Schindelin
2008-06-14 23:22 ` Miklos Vajna
2008-06-15 9:01 ` Jakub Narebski
2008-06-15 12:06 ` Miklos Vajna
2008-06-15 5:04 ` Junio C Hamano
2008-06-16 9:01 ` Mike Ralphson [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e2b179460806160201j133dac0eg37c88b5670541ff8@mail.gmail.com \
--to=mike.ralphson@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--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.
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 NNTP newsgroup(s).