summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-05-03 22:01:26 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-05-03 22:01:26 (GMT)
commit3f3e2c26fa0325f4df952363f8f5046ca8158bb3 (patch)
treec1fd36e7ba69f1b24f38a47d7cae407b26abd899
parent652f0c8f1df362755253fe9c5a975be7e5a5cbdc (diff)
parent150115aded2e1e0a83db7366f59e4b5bf1aa8135 (diff)
downloadgit-3f3e2c26fa0325f4df952363f8f5046ca8158bb3.zip
git-3f3e2c26fa0325f4df952363f8f5046ca8158bb3.tar.gz
git-3f3e2c26fa0325f4df952363f8f5046ca8158bb3.tar.bz2
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
-rw-r--r--diff.c10
-rwxr-xr-xt/t4020-diff-external.sh8
2 files changed, 17 insertions, 1 deletions
diff --git a/diff.c b/diff.c
index 416c5aa..635fbc9 100644
--- a/diff.c
+++ b/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
@@ -1690,6 +1691,13 @@ static int reuse_worktree_file(const char *name, const unsigned char *sha1, int
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.
*/
if (ce_uptodate(ce) ||
diff --git a/t/t4020-diff-external.sh b/t/t4020-diff-external.sh
index caea292..2a72e75 100755
--- a/t/t4020-diff-external.sh
+++ b/t/t4020-diff-external.sh
@@ -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