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
This commit is contained in:
Junio C Hamano 2009-05-03 15:01:26 -07:00
Родитель 652f0c8f1d 150115aded
Коммит 3f3e2c26fa
2 изменённых файлов: 17 добавлений и 1 удалений

10
diff.c
Просмотреть файл

@ -1649,7 +1649,8 @@ static int reuse_worktree_file(const char *name, const unsigned char *sha1, int
struct stat st;
int pos, len;
/* We do not read the cache ourselves here, because the
/*
* We do not read the cache ourselves here, because the
* benchmark with my previous version that always reads cache
* shows that it makes things worse for diff-tree comparing
* two linux-2.6 kernel trees in an already checked out work
@ -1689,6 +1690,13 @@ static int reuse_worktree_file(const char *name, const unsigned char *sha1, int
if (hashcmp(sha1, ce->sha1) || !S_ISREG(ce->ce_mode))
return 0;
/*
* If ce is marked as "assume unchanged", there is no
* guarantee that work tree matches what we are looking for.
*/
if (ce->ce_flags & CE_VALID)
return 0;
/*
* If ce matches the file in the work tree, we can reuse it.
*/

Просмотреть файл

@ -128,4 +128,12 @@ test_expect_success 'force diff with "diff"' '
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