From: Junio C Hamano Date: Sun, 5 Mar 2006 22:43:56 +0000 (-0800) Subject: blame: avoid "diff -u0". X-Git-Tag: v1.3.0-rc1~13^2~37 X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=604c86d15bb319a1e93ba218fca48ce1c500ae52;p=git.git blame: avoid "diff -u0". As Linus suggests, use "diff -u -U 0" instead. Signed-off-by: Junio C Hamano --- diff --git a/blame.c b/blame.c index ffc1f52a..fca22f90 100644 --- 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));