Browse Source

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 bc1a580757 commit)
maint v1.4.2.2
Junio C Hamano 19 years ago
parent
commit
82ca505564
  1. 2
      diff.c

2
diff.c

@ -333,7 +333,7 @@ static void emit_rewrite_diff(const char *name_a, @@ -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);

Loading…
Cancel
Save