summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-09-29 09:06:24 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-09-30 05:32:16 (GMT)
commit82ca50556471eadfc3212cb478161c3da5c4d02a (patch)
tree33a464255998d7c1b625397ce65e316c760cd413
parentf2b5792564754d5ba812a0d3eaec2440dfc0652a (diff)
downloadgit-82ca50556471eadfc3212cb478161c3da5c4d02a.zip
git-82ca50556471eadfc3212cb478161c3da5c4d02a.tar.gz
git-82ca50556471eadfc3212cb478161c3da5c4d02a.tar.bz2
git-diff -B output fix.v1.4.2.2
Geert noticed that complete rewrite diff missed the usual a/ and b/ leading paths. Pickaxe says it never worked, ever. Embarrassing. Signed-off-by: Junio C Hamano <junkio@cox.net> (cherry picked from bc1a5807575b2f34538d4158834da6524a4fc1f7 commit)
-rw-r--r--diff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff.c b/diff.c
index b3b1781..5dbc913 100644
--- a/diff.c
+++ b/diff.c
@@ -333,7 +333,7 @@ static void emit_rewrite_diff(const char *name_a,
diff_populate_filespec(two, 0);
lc_a = count_lines(one->data, one->size);
lc_b = count_lines(two->data, two->size);
- printf("--- %s\n+++ %s\n@@ -", name_a, name_b);
+ printf("--- a/%s\n+++ b/%s\n@@ -", name_a, name_b);
print_line_count(lc_a);
printf(" +");
print_line_count(lc_b);