diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2009-12-14 18:43:58 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-14 14:03:58 -0800 |
| commit | 56cac48c3550de88d71b3944576d44337261d71b (patch) | |
| tree | 80e3e42d8daeb595948c554f754aa6e6ccfaeebe /unpack-trees.c | |
| parent | bbbe508d771f6a4c65fea43343597ecfa1eb540e (diff) | |
| download | git-56cac48c3550de88d71b3944576d44337261d71b.tar.gz | |
ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALID
Previously CE_MATCH_IGNORE_VALID flag is used by both valid and
skip-worktree bits. While the two bits have similar behaviour, sharing
this flag means "git update-index --really-refresh" will ignore
skip-worktree while it should not. Instead another flag is
introduced to ignore skip-worktree bit, CE_MATCH_IGNORE_VALID only
applies to valid bit.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'unpack-trees.c')
| -rw-r--r-- | unpack-trees.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index 80ae2a0f4f..d33b39e084 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -569,7 +569,7 @@ static int verify_uptodate_1(struct cache_entry *ce, return 0; if (!lstat(ce->name, &st)) { - unsigned changed = ie_match_stat(o->src_index, ce, &st, CE_MATCH_IGNORE_VALID); + unsigned changed = ie_match_stat(o->src_index, ce, &st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE); if (!changed) return 0; /* @@ -701,7 +701,7 @@ static int icase_exists(struct unpack_trees_options *o, struct cache_entry *dst, struct cache_entry *src; src = index_name_exists(o->src_index, dst->name, ce_namelen(dst), 1); - return src && !ie_match_stat(o->src_index, src, st, CE_MATCH_IGNORE_VALID); + return src && !ie_match_stat(o->src_index, src, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE); } /* @@ -1152,7 +1152,7 @@ int oneway_merge(struct cache_entry **src, struct unpack_trees_options *o) if (o->reset && !ce_uptodate(old) && !ce_skip_worktree(old)) { struct stat st; if (lstat(old->name, &st) || - ie_match_stat(o->src_index, old, &st, CE_MATCH_IGNORE_VALID)) + ie_match_stat(o->src_index, old, &st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE)) update |= CE_UPDATE; } add_entry(o, old, update, 0); |