git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
	Don Zickus <dzickus@redhat.com>
Subject: Re: [PATCH] apply: fix copy/rename breakage
Date: Wed, 09 Jul 2008 20:13:04 -0700	[thread overview]
Message-ID: <7vtzeyqvnj.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <7vy74aqvr1.fsf@gitster.siamese.dyndns.org> (Junio C. Hamano's message of "Wed, 09 Jul 2008 20:10:58 -0700")

Junio C Hamano <gitster@pobox.com> writes:

> Recently, 7ebd52a (Merge branch 'dz/apply-again', 2008-07-01) taught
> "git-apply" to grok a (non-git) patch that is a concatenation of separate
> patches that touch the same file number of files, by recording the

Eh, s/files/times/;

> postimage of patch application of previous round and using it as the
> preimage for later rounds.
>
> However, this "incremental" mode of patch application contradicts with the
> way git rename/copy patches are fundamentally designed....
> a patch to produce new files out of existing file by copying to fix this
> issue.
>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
>
>  * Applies to 'master'.  I am CC'ing Linus not because he is in any way
>    responsible for this breakage, but because this breakage can affect
>    heavy users of "git apply".

  reply	other threads:[~2008-07-10  3:14 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-07-10  3:10 [PATCH] apply: fix copy/rename breakage Junio C Hamano
2008-07-10  3:13 ` Junio C Hamano [this message]
2008-07-10  4:21 ` Stephan Beyer
2008-07-10 14:01 ` Don Zickus
2008-07-10 15:22   ` Johannes Sixt
2008-07-10 15:43     ` Don Zickus

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=7vtzeyqvnj.fsf@gitster.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=dzickus@redhat.com \
    --cc=git@vger.kernel.org \
    --cc=torvalds@linux-foundation.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).