mirror of
https://github.com/git/git.git
synced 2024-11-24 10:26:17 +08:00
diff: fix output of total-rewrite diff.
We did not read in the file data before emitting the total-rewrite diff. Noticed by Pasky. Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
f0853837d6
commit
a041d94f29
5
diff.c
5
diff.c
@ -142,11 +142,12 @@ static void copy_file(int prefix, const char *data, int size)
|
||||
|
||||
static void emit_rewrite_diff(const char *name_a,
|
||||
const char *name_b,
|
||||
struct diff_filespec *one,
|
||||
struct diff_filespec *one,
|
||||
struct diff_filespec *two)
|
||||
{
|
||||
/* Use temp[i].name as input, name_a and name_b as labels */
|
||||
int lc_a, lc_b;
|
||||
diff_populate_filespec(one, 0);
|
||||
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);
|
||||
|
Loading…
Reference in New Issue
Block a user