blame: avoid "diff -u0".
authorJunio C Hamano <junkio@cox.net>
Sun, 5 Mar 2006 22:43:56 +0000 (14:43 -0800)
committerJunio C Hamano <junkio@cox.net>
Mon, 6 Mar 2006 00:02:44 +0000 (16:02 -0800)
As Linus suggests, use "diff -u -U 0" instead.

Signed-off-by: Junio C Hamano <junkio@cox.net>
blame.c

diff --git a/blame.c b/blame.c
index ffc1f52add2a29afbaae6b67bf43616caa1b0710..fca22f900099b1a9c1c6450d991392e19292f178 100644 (file)
--- a/blame.c
+++ b/blame.c
@@ -92,7 +92,7 @@ static struct patch *get_patch(struct commit *commit, struct commit *other)
                die("write failed: %s", strerror(errno));
        close(fd);
 
-       sprintf(diff_cmd, "diff -u0 %s %s", tmp_path1, tmp_path2);
+       sprintf(diff_cmd, "diff -u -U 0 %s %s", tmp_path1, tmp_path2);
        fin = popen(diff_cmd, "r");
        if (!fin)
                die("popen failed: %s", strerror(errno));