diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-03-25 12:16:17 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-25 16:50:00 -0800 |
| commit | 3ce8f08944e614813c7dfb212a88b7c4e3b443bc (patch) | |
| tree | 0ea80c1ceb83a898851ff8d097db9a5b157e0189 /t | |
| parent | 621c53cc082299eaf69e9f2dc0274547c7d87fb0 (diff) | |
| download | git-3ce8f08944e614813c7dfb212a88b7c4e3b443bc.tar.gz git-3ce8f08944e614813c7dfb212a88b7c4e3b443bc.tar.xz | |
built-in diff: minimum tweaks
This fixes up a couple of minor issues with the real built-in
diff to be more usable:
- Omit ---/+++ header unless we emit diff output;
- Detect and punt binary diff like GNU does;
- Honor GIT_DIFF_OPTS minimally (only -u<number> and
--unified=<number> are currently supported);
- Omit line count of 1 from "@@ -l,k +m,n @@" hunk header
(i.e. when k == 1 or n == 1)
- Adjust testsuite for the lack of -p support.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4001-diff-rename.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4001-diff-rename.sh b/t/t4001-diff-rename.sh index 2e3c20d6b..08c11319a 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 @@ Line 7 +@@ -8,7 +8,7 @@ Line 8 Line 9 Line 10 |