aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorMark Wooding <mdw@distorted.org.uk>2006-03-28 03:23:31 +0100
committerJunio C Hamano <junkio@cox.net>2006-03-27 18:43:51 -0800
commitacb725772964ee11656543a28c303e9aa6d092c5 (patch)
treef2b53ddc3d0b5640819a4c6d10ee6c6c6d4ee37e /t
parent9c48666aa0745c666593bb7383e17f78c43eb36d (diff)
downloadgit-acb725772964ee11656543a28c303e9aa6d092c5.tar.gz
git-acb725772964ee11656543a28c303e9aa6d092c5.tar.xz
xdiff: Show function names in hunk headers.
The speed of the built-in diff generator is nice; but the function names shown by `diff -p' are /really/ nice. And I hate having to choose. So, we hack xdiff to find the function names and print them. xdiff has grown a flag to say whether to dig up the function names. The builtin_diff function passes this flag unconditionally. I suppose it could parse GIT_DIFF_OPTS, but it doesn't at the moment. I've also reintroduced the `function name' into the test suite, from which it was removed in commit 3ce8f089. The function names are parsed by a particularly stupid algorithm at the moment: it just tries to find a line in the `old' file, from before the start of the hunk, whose first character looks plausible. Still, it's most definitely a start. Signed-off-by: Mark Wooding <mdw@distorted.org.uk> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't')
-rwxr-xr-xt/t4001-diff-rename.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4001-diff-rename.sh b/t/t4001-diff-rename.sh
index 08c11319a..2e3c20d6b 100755
--- a/t/t4001-diff-rename.sh
+++ b/t/t4001-diff-rename.sh
@@ -49,7 +49,7 @@ rename from path0
rename to path1
--- a/path0
+++ b/path1
-@@ -8,7 +8,7 @@
+@@ -8,7 +8,7 @@ Line 7
Line 8
Line 9
Line 10