@matheusbsbs / matheus-bagliano / commits / 690e307f54
Fork 0

blame: unbreak "diff -U 0".

The commit 604c86d15bb319a1e93ba218fca48ce1c500ae52 changed the original "diff -u0" to "diff -u -U 0" for portability. A big mistake without proper testing. The form "diff -u -U 0" shows the default 3-line contexts, because -u and -U 0 contradicts with each other; "diff -U 0" (or its longhand "diff --unified=0") is what we meant. Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Mar 6, 2006 at 00:32 UTC 690e307f54b4aa84349b89e8552b25e7495f1cd6
1 file changed +2 -2
blame.c
+2 -2
@@ -92,7 +92,7 @@ static struct patch *get_patch(struct commit *commit, struct commit *other)
92 die("write failed: %s", strerror(errno));
93 close(fd);
94
95 - sprintf(diff_cmd, "diff -u -U 0 %s %s", tmp_path1, tmp_path2);
95 + sprintf(diff_cmd, "diff -U 0 %s %s", tmp_path1, tmp_path2);
96 fin = popen(diff_cmd, "r");
97 if (!fin)
98 die("popen failed: %s", strerror(errno));
@@ -234,7 +234,7 @@ static void print_patch(struct patch *p)
234 }
235 }
236
237 -#if 0
237 +#if DEBUG
238 /* For debugging only */
239 static void print_map(struct commit *cmit, struct commit *other)
240 {