diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-03-28 00:42:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-28 00:42:31 -0700 |
| commit | aa72a14a7f648ae47749281002e94cfcf36f39e2 (patch) | |
| tree | a63743757a78f2585f13550faec0ed474cca36cd /t | |
| parent | Merge branch 'js/remote-improvements' (diff) | |
| parent | diff --cached: do not borrow from a work tree when a path is marked as assume... (diff) | |
| download | tgif-aa72a14a7f648ae47749281002e94cfcf36f39e2.tar.xz | |
Merge branch 'jc/maint-1.6.0-diff-borrow-carefully'
* jc/maint-1.6.0-diff-borrow-carefully:
diff --cached: do not borrow from a work tree when a path is marked as assume-unchanged
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4020-diff-external.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t4020-diff-external.sh b/t/t4020-diff-external.sh index f8c99f1a98..0720001281 100755 --- a/t/t4020-diff-external.sh +++ b/t/t4020-diff-external.sh @@ -152,4 +152,12 @@ test_expect_success 'external diff with autocrlf = true' ' test $(wc -l < crlfed.txt) = $(cat crlfed.txt | keep_only_cr | wc -c) ' +test_expect_success 'diff --cached' ' + git add file && + git update-index --assume-unchanged file && + echo second >file && + git diff --cached >actual && + test_cmp ../t4020/diff.NUL actual +' + test_done |