[PATCH] blame: unbreak "diff -U 0".
- From
Junio C Hamano <junkio@cox.net>
- Date
- Mar 6, 2006, 08:45 UTC
- Message-ID
- <7vr75g6jxu.fsf@assigned-by-dhcp.cox.net>
- In-Reply-To
- <7v1wxg82r3.fsf@assigned-by-dhcp.cox.net>
Junio C Hamano <junkio@cox.net> writes:
> The "deathmatch" between Ryan's annotate and Fredrik's blame is > officially on. Currently the last test in all three branches > fail. Please do not get alarmed.
It turns out the breakage was caused after merging Fredrik's improvements. I'm double-checking the fix and will be pushing out corrected "master", "next" and "pu" shortly.
Sorry, Fredrik.
-- >8 -- Subject: [PATCH] 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>
---
blame.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
690e307f54b4aa84349b89e8552b25e7495f1cd6
diff --git a/blame.c b/blame.c index fca22f9..90338af 100644 --- a/blame.c +++ b/blame.c @@ -92,7 +92,7 @@ static struct patch *get_patch(struct co 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) {
-- 1.2.4.g3bcd