From: Junio C Hamano Date: Sun, 3 May 2009 22:01:26 +0000 (-0700) Subject: Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint-1.6.1 X-Git-Tag: v1.6.1.4~2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3f3e2c26fa0325f4df952363f8f5046ca8158bb3;p=git.git Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint-1.6.1 * 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 --- 3f3e2c26fa0325f4df952363f8f5046ca8158bb3 diff --cc t/t4020-diff-external.sh index caea292f1,f853b8a89..2a72e751e --- a/t/t4020-diff-external.sh +++ b/t/t4020-diff-external.sh @@@ -125,7 -104,15 +125,15 @@@ echo NULZbetweenZwords | perl -pe 'y/Z/ test_expect_success 'force diff with "diff"' ' echo >.gitattributes "file diff" && git diff >actual && - test_cmp ../t4020/diff.NUL actual + test_cmp "$TEST_DIRECTORY"/t4020/diff.NUL actual ' + 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