On 7/26/06, Junio C Hamano <junkio@xxxxxxx> wrote:
We should correctly handle cases that fit your general description (the test t/t4112-apply-renames.sh has a file in "klibc/arch/x86_64" which is renamed and copied to two different locations under "include/arch"). The above does not reproduce for me if I used "git diff HEAD >patch" in place of "cg diff" (I cannot make cg behave on my machine).
cg diff makes a patch this looks like this diff --git a/gitweb/README b/zzz/gitweb/README similarity index 100% rename from gitweb/README rename to zzz/gitweb/README diff --git a/gitweb/gitweb.cgi b/zzz/gitweb/gitweb.cgi similarity index 100% rename from gitweb/gitweb.cgi rename to zzz/gitweb/gitweb.cgi diff --git a/gitweb/gitweb.css b/zzz/gitweb/gitweb.css similarity index 100% rename from gitweb/gitweb.css rename to zzz/gitweb/gitweb.css diff --git "a/gitweb/test/M\303\244rchen" "b/zzz/gitweb/test/M\303\244rchen" similarity index 100% rename from "gitweb/test/M\303\244rchen" rename to "zzz/gitweb/test/M\303\244rchen" diff --git a/gitweb/test/file with spaces b/zzz/gitweb/test/file with spaces similarity index 100% rename from gitweb/test/file with spaces rename to zzz/gitweb/test/file with spaces diff --git a/gitweb/test/file+plus+sign b/zzz/gitweb/test/file+plus+sign similarity index 100% rename from gitweb/test/file+plus+sign rename to zzz/gitweb/test/file+plus+sign git diff HEAD makes a much longer patch that deltas out the existing files and delta in the new file. It's applying patches in the extended git format that fails. -- Jon Smirl jonsmirl@xxxxxxxxx - : send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html