@matheusbsbs / matheus-bagliano / commits / ce74618d95
Fork 0

git-diff/git-apply: make diff output a bit friendlier to GNU patch (part 1)

Somebody was wondering on #git channel why a git generated diff does not apply with GNU patch when the filename contains a SP. It is because GNU patch expects to find TAB (and trailing timestamp) on ---/+++ (old_name and new_name) lines after the filenames. The "diff --git" output format was carefully designed to be compatible with GNU patch where it can, but whitespace characters were always a pain. We can make our output a bit more GNU patch friendly by adding an extra TAB (but not trailing timestamp) to old/new name lines when the filename as a SP in it. This updates git-apply to prepare ourselves to accept such a patch, but we still do not generate output that is patch friendly yet. That change needs to wait until everybody has this change. When a filename contains a real tab, "diff --git" format always c-quotes it as discussed on the list with GNU patch maintainer previously: http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2 so there should be no downside. Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Sep 22, 2006 at 16:17 UTC ce74618d95088d99de53fb691f361da05932f705
1 file changed +2 -2
builtin-apply.c
+2 -2
@@ -360,7 +360,7 @@ static int gitdiff_hdrend(const char *line, struct patch *patch)
360 static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name, const char *oldnew)
361 {
362 if (!orig_name && !isnull)
363 - return find_name(line, NULL, 1, 0);
363 + return find_name(line, NULL, 1, TERM_TAB);
364
365 if (orig_name) {
366 int len;
@@ -370,7 +370,7 @@ static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name,
370 len = strlen(name);
371 if (isnull)
372 die("git-apply: bad git-diff - expected /dev/null, got %s on line %d", name, linenr);
373 - another = find_name(line, NULL, 1, 0);
373 + another = find_name(line, NULL, 1, TERM_TAB);
374 if (!another || memcmp(another, name, len))
375 die("git-apply: bad git-diff - inconsistent %s filename on line %d", oldnew, linenr);
376 free(another);