Re: [PATCH] apply: fix copy/rename breakage

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 10, 2008, 03:13 UTC
Message-ID: <7vtzeyqvnj.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <7vy74aqvr1.fsf@gitster.siamese.dyndns.org>

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/;

Show 14 quoted lines

> 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".