git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
DZDon Zickus <dzickus@redhat.com>
Date
Jul 10, 2008, 14:01 UTC
Message-ID
<20080710140154.GN26957@redhat.com>
In-Reply-To
<7vy74aqvr1.fsf@gitster.siamese.dyndns.org>
On Wed, Jul 09, 2008 at 08:10:58PM -0700, Junio C Hamano wrote:
Show 29 quoted lines
> 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
> 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.  When a git patch
> talks about a file A getting modified, and a new file B created out of B,
> like this:
> 
> 	diff --git a/A b/A
> 	--- a/A
> 	+++ b/A
> 	... change text here ...
> 	diff --git a/A b/B
> 	copy from A
> 	copy to B
> 	--- a/A
> 	+++ b/B
> 	... change text here ...
> 
> the second change to produce B does not depend on what is done to A with
> the first change (this is explicitly done so for reviewability of
> individual patches).
> 
> With this patch, we disable the postimage record 'fn_table' when applying
> a patch to produce new files out of existing file by copying to fix this
> issue.
Odd.  I guess the way I read this workflow is
apply change X to A, copy A' to B, apply change Y to B => B' now has changes X+Y

But instead you are saying B' only has change Y because A is copied to B not A'.

Regardless, it doesn't affect my workflow.
ACK.

Cheers, Don

Previous: Stephan BeyerNext: Johannes Sixt
Message 4 of 6 in “apply: fix copy/rename breakage”
  1. apply: fix copy/rename breakageJunio C Hamano, Jul 10, 2008
  2. Junio C HamanoJul 10, 2008
  3. Stephan BeyerJul 10, 2008
  4. Don ZickusJul 10, 2008
  5. Johannes SixtJul 10, 2008
  6. Don ZickusJul 10, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.