Code

git-diff -B output fix.
authorJunio C Hamano <junkio@cox.net>
Fri, 29 Sep 2006 09:06:24 +0000 (02:06 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 29 Sep 2006 09:06:24 +0000 (02:06 -0700)
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>
diff.c

diff --git a/diff.c b/diff.c
index 2464238ccd6c94a53a0a73de476e33f7cc935ab9..17f5a911d3b407bf9265087c845014bcb6be80c7 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -208,7 +208,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);