diff for duplicates of <20100903233252.GD30310@burratino> diff --git a/a/1.txt b/N1/1.txt index de36d2c..3c3e337 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,43 +2,3 @@ Andreas Gruenbacher wrote: > something pretty bizarre is going on here. The wget output modifies the same > file twice, but both patches to this file have the same source sha1 (5645f35): - -From the git v1.6.0-rc0~92 changelog entry: - - apply: fix copy/rename breakage - - 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 times, by recording the postimage of patch - application of previous round and using it as the preimage for later - rounds. - - This "incremental" mode of patch application fundamentally contradicts - with the way git rename/copy patches are designed. When a git patch talks - about a file A getting modified, and a new file B created out of A, 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 in any way. This is explicitly done so for reviewability - of individual patches. - - With this commit, we do not look at 'fn_table' that records the postimage - of previous round when applying a patch to produce a new file out of an - existing file. - -> How was this patch generated: with git itself? - -Yes, the patch basically agrees with what I get by applying it and running - - git format-patch -M -B HEAD^..HEAD diff --git a/a/content_digest b/N1/content_digest index 38acc7c..3bca2fc 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,62 +2,15 @@ "ref\020100903182323.GA17152@pengutronix.de\0" "ref\020100903184351.GC2341@burratino\0" "ref\0201009040058.18028.agruen@suse.de\0" - "From\0Jonathan Nieder <jrnieder@gmail.com>\0" - "Subject\0Re: [bug-patch] [BUG?] rename patch accepted with --dry-run,\0" - "Date\0Fri, 03 Sep 2010 23:32:52 +0000\0" - "To\0Andreas Gruenbacher <agruen@suse.de>\0" - "Cc\0bug-patch@gnu.org" - " Uwe Kleine-K\303\266nig <u.kleine-koenig@pengutronix.de>" - linux-sh@vger.kernel.org - Magnus Damm <magnus.damm@gmail.com> - linux-arm-kernel@lists.infradead.org - Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> - " git@vger.kernel.org\0" + "From\0jrnieder@gmail.com (Jonathan Nieder)\0" + "Subject\0[bug-patch] [BUG?] rename patch accepted with --dry-run, rejected without (Re: [PATCH V3] arm & sh: factorised duplicated clkdev.c)\0" + "Date\0Fri, 3 Sep 2010 18:32:52 -0500\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Andreas Gruenbacher wrote:\n" "\n" "> something pretty bizarre is going on here. The wget output modifies the same \n" - "> file twice, but both patches to this file have the same source sha1 (5645f35):\n" - "\n" - "From the git v1.6.0-rc0~92 changelog entry:\n" - "\n" - " apply: fix copy/rename breakage\n" - " \n" - " 7ebd52a (Merge branch 'dz/apply-again', 2008-07-01) taught \"git-apply\" to\n" - " grok a (non-git) patch that is a concatenation of separate patches that\n" - " touch the same file number of times, by recording the postimage of patch\n" - " application of previous round and using it as the preimage for later\n" - " rounds.\n" - " \n" - " This \"incremental\" mode of patch application fundamentally contradicts\n" - " with the way git rename/copy patches are designed. When a git patch talks\n" - " about a file A getting modified, and a new file B created out of A, like\n" - " this:\n" - " \n" - " diff --git a/A b/A\n" - " --- a/A\n" - " +++ b/A\n" - " ... change text here ...\n" - " diff --git a/A b/B\n" - " copy from A\n" - " copy to B\n" - " --- a/A\n" - " +++ b/B\n" - " ... change text here ...\n" - " \n" - " the second change to produce B does not depend on what is done to A with\n" - " the first change in any way. This is explicitly done so for reviewability\n" - " of individual patches.\n" - " \n" - " With this commit, we do not look at 'fn_table' that records the postimage\n" - " of previous round when applying a patch to produce a new file out of an\n" - " existing file.\n" - "\n" - "> How was this patch generated: with git itself?\n" - "\n" - "Yes, the patch basically agrees with what I get by applying it and running\n" - "\n" - git format-patch -M -B HEAD^..HEAD + > file twice, but both patches to this file have the same source sha1 (5645f35): -bc5957ebe44f181ab92833e05071bd20550c551b48895506e9d364121f24ae33 +5515a681711129df641a6dc011f6b09d478ada7ff1836604fcda41e3de0d7b69
diff --git a/a/1.txt b/N2/1.txt index de36d2c..ce9bbc9 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -3,7 +3,7 @@ Andreas Gruenbacher wrote: > something pretty bizarre is going on here. The wget output modifies the same > file twice, but both patches to this file have the same source sha1 (5645f35): -From the git v1.6.0-rc0~92 changelog entry: +>From the git v1.6.0-rc0~92 changelog entry: apply: fix copy/rename breakage diff --git a/a/content_digest b/N2/content_digest index 38acc7c..5b0202a 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,8 +3,8 @@ "ref\020100903184351.GC2341@burratino\0" "ref\0201009040058.18028.agruen@suse.de\0" "From\0Jonathan Nieder <jrnieder@gmail.com>\0" - "Subject\0Re: [bug-patch] [BUG?] rename patch accepted with --dry-run,\0" - "Date\0Fri, 03 Sep 2010 23:32:52 +0000\0" + "Subject\0Re: [bug-patch] [BUG?] rename patch accepted with --dry-run, rejected without (Re: [PATCH V3] arm & sh: factorised duplicated clkdev.c)\0" + "Date\0Fri, 3 Sep 2010 18:32:52 -0500\0" "To\0Andreas Gruenbacher <agruen@suse.de>\0" "Cc\0bug-patch@gnu.org" " Uwe Kleine-K\303\266nig <u.kleine-koenig@pengutronix.de>" @@ -20,7 +20,7 @@ "> something pretty bizarre is going on here. The wget output modifies the same \n" "> file twice, but both patches to this file have the same source sha1 (5645f35):\n" "\n" - "From the git v1.6.0-rc0~92 changelog entry:\n" + ">From the git v1.6.0-rc0~92 changelog entry:\n" "\n" " apply: fix copy/rename breakage\n" " \n" @@ -60,4 +60,4 @@ "\n" git format-patch -M -B HEAD^..HEAD -bc5957ebe44f181ab92833e05071bd20550c551b48895506e9d364121f24ae33 +688d229ec894704432e11659914885a302bda01f90ace08c891ccc18b94d9bd1
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.