mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-25 02:44:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

blame: unbreak "diff -U 0".

Browse Source 
The commit 604c86d15b 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>
This commit is contained in:
Junio C Hamano 2006-03-06 00:32:50 -08:00
parent ce5b6e7111
commit 690e307f54
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
blame.c
View File

@ -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 -u -U 0 %s %s", tmp_path1, tmp_path2);
sprintf(diff_cmd, "diff -U 0 %s %s", tmp_path1, tmp_path2);
fin = popen(diff_cmd, "r");
if (!fin)
die("popen failed: %s", strerror(errno));
@ -234,7 +234,7 @@ static void print_patch(struct patch *p)
}
}
#if 0
#if DEBUG
/* For debugging only */
static void print_map(struct commit *cmit, struct commit *other)
{