From: Junio C Hamano <junkio@cox.net>
Date: Fri, 29 Sep 2006 09:06:24 +0000 (-0700)
Subject: git-diff -B output fix.
X-Git-Tag: v1.4.2.2^0
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=82ca50556471eadfc3212cb478161c3da5c4d02a;p=git.git

git-diff -B output fix.

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)
---

diff --git a/diff.c b/diff.c
index b3b1781a9..5dbc913a9 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);