From: Junio C Hamano <junkio@cox.net>
Date: Sun, 9 Apr 2006 02:45:39 +0000 (-0700)
Subject: diff: fix output of total-rewrite diff.
X-Git-Tag: v1.3.0-rc4~27
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=a041d94f29d76d53ff3cc4169b99c6eefea8639d;p=git.git

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

diff --git a/diff.c b/diff.c
index ce98a908..30e4d50b 100644
--- a/diff.c
+++ b/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);