mirror of
https://github.com/git/git
synced 2024-10-06 00:29:28 +00:00
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>
This commit is contained in:
parent
21ff2bdb88
commit
bc1a580757
2
diff.c
2
diff.c
|
@ -208,7 +208,7 @@ static void emit_rewrite_diff(const char *name_a,
|
||||||
diff_populate_filespec(two, 0);
|
diff_populate_filespec(two, 0);
|
||||||
lc_a = count_lines(one->data, one->size);
|
lc_a = count_lines(one->data, one->size);
|
||||||
lc_b = count_lines(two->data, two->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);
|
print_line_count(lc_a);
|
||||||
printf(" +");
|
printf(" +");
|
||||||
print_line_count(lc_b);
|
print_line_count(lc_b);
|
||||||
|
|
Loading…
Reference in a new issue