diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2009-12-14 11:43:58 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-14 22:03:58 (GMT) |
| commit | 56cac48c3550de88d71b3944576d44337261d71b (patch) | |
| tree | 80e3e42d8daeb595948c554f754aa6e6ccfaeebe /builtin-apply.c | |
| parent | bbbe508d771f6a4c65fea43343597ecfa1eb540e (diff) | |
| download | git-56cac48c3550de88d71b3944576d44337261d71b.zip git-56cac48c3550de88d71b3944576d44337261d71b.tar.gz git-56cac48c3550de88d71b3944576d44337261d71b.tar.bz2 | |
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 'builtin-apply.c')
| -rw-r--r-- | builtin-apply.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-apply.c b/builtin-apply.c index 39dc96a..7717a66 100644 --- a/builtin-apply.c +++ b/builtin-apply.c @@ -2505,7 +2505,7 @@ static int verify_index_match(struct cache_entry *ce, struct stat *st) return -1; return 0; } - return ce_match_stat(ce, st, CE_MATCH_IGNORE_VALID); + return ce_match_stat(ce, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE); } static int check_preimage(struct patch *patch, struct cache_entry **ce, struct stat *st) |