diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-05-26 22:38:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-26 22:38:19 -0700 |
| commit | 3beb56bde63d1a10abc02ffe76c1f98d59ec0874 (patch) | |
| tree | 69a2fa30848725866acfc359799bbfab5a2ce1d7 /t/diff-lib.sh | |
| parent | Merge branch 'maint' (diff) | |
| parent | git diff --no-index: default to page like other diff frontends (diff) | |
| download | git-3beb56bde63d1a10abc02ffe76c1f98d59ec0874.tar.gz git-3beb56bde63d1a10abc02ffe76c1f98d59ec0874.zip | |
Merge branch 'jc/diff-no-no-index'
* jc/diff-no-no-index:
git diff --no-index: default to page like other diff frontends
git-diff: allow --no-index semantics a bit more
"git diff": do not ignore index without --no-index
diff-files: do not play --no-index games
tests: do not use implicit "git diff --no-index"
Diffstat (limited to 't/diff-lib.sh')
| -rw-r--r-- | t/diff-lib.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/diff-lib.sh b/t/diff-lib.sh index 28b941c493..4bddeb591e 100644 --- a/t/diff-lib.sh +++ b/t/diff-lib.sh @@ -11,7 +11,7 @@ compare_diff_raw () { sed -e "$sanitize_diff_raw" <"$1" >.tmp-1 sed -e "$sanitize_diff_raw" <"$2" >.tmp-2 - git diff .tmp-1 .tmp-2 && rm -f .tmp-1 .tmp-2 + test_cmp .tmp-1 .tmp-2 && rm -f .tmp-1 .tmp-2 } sanitize_diff_raw_z='/^:/s/ '"$_x40"' '"$_x40"' \([A-Z]\)[0-9]*$/ X X \1#/' @@ -23,7 +23,7 @@ compare_diff_raw_z () { perl -pe 'y/\000/\012/' <"$1" | sed -e "$sanitize_diff_raw_z" >.tmp-1 perl -pe 'y/\000/\012/' <"$2" | sed -e "$sanitize_diff_raw_z" >.tmp-2 - git diff .tmp-1 .tmp-2 && rm -f .tmp-1 .tmp-2 + test_cmp .tmp-1 .tmp-2 && rm -f .tmp-1 .tmp-2 } compare_diff_patch () { @@ -37,5 +37,5 @@ compare_diff_patch () { /^[dis]*imilarity index [0-9]*%$/d /^index [0-9a-f]*\.\.[0-9a-f]/d ' <"$2" >.tmp-2 - git diff .tmp-1 .tmp-2 && rm -f .tmp-1 .tmp-2 + test_cmp .tmp-1 .tmp-2 && rm -f .tmp-1 .tmp-2 } |