aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-03-05 14:43:56 -0800
committerJunio C Hamano <junkio@cox.net>2006-03-05 16:02:44 -0800
commit604c86d15bb319a1e93ba218fca48ce1c500ae52 (patch)
tree3f73a07027a46cc8836897560ba3134bbb85a6c5
parent8752d11d60e8f48b6e242e7f504c8e8fd7eabb92 (diff)
downloadgit-604c86d15bb319a1e93ba218fca48ce1c500ae52.tar.gz
git-604c86d15bb319a1e93ba218fca48ce1c500ae52.tar.xz
blame: avoid "diff -u0".
As Linus suggests, use "diff -u -U 0" instead. Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--blame.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/blame.c b/blame.c
index ffc1f52ad..fca22f900 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));