summaryrefslogtreecommitdiff
path: root/unpack-trees.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-13 11:21:11 -0700
committerJunio C Hamano <gitster@pobox.com>2010-06-13 11:21:11 -0700
commit40e9b27dec28692464f43d1c213d465fed8994ba (patch)
treedb57c8cf1c828d4ac08fc0d717995869b7f6c07d /unpack-trees.c
parent95e42a64a9e713bcc3c4590fb933c93d37342322 (diff)
parentac472ba65f75fbdbc52328f2bdc8645e5289e683 (diff)
downloadgit-40e9b27dec28692464f43d1c213d465fed8994ba.tar.gz
Merge branch 'cb/assume-unchanged-fix'
* cb/assume-unchanged-fix: Documentation: git-add does not update files marked "assume unchanged" do not overwrite files marked "assume unchanged"
Diffstat (limited to 'unpack-trees.c')
-rw-r--r--unpack-trees.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/unpack-trees.c b/unpack-trees.c
index c29a9e067f..490cd5f6f4 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -854,7 +854,7 @@ static int verify_uptodate_1(struct cache_entry *ce,
{
struct stat st;
- if (o->index_only || (!ce_skip_worktree(ce) && (o->reset || ce_uptodate(ce))))
+ if (o->index_only || (!((ce->ce_flags & CE_VALID) || ce_skip_worktree(ce)) && (o->reset || ce_uptodate(ce))))
return 0;
if (!lstat(ce->name, &st)) {