diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2009-12-14 14:43:58 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-15 01:03:58 +0300 |
| commit | 56cac48c3550de88d71b3944576d44337261d71b (patch) | |
| tree | 80e3e42d8daeb595948c554f754aa6e6ccfaeebe /cache.h | |
| parent | bbbe508d771f6a4c65fea43343597ecfa1eb540e (diff) | |
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 'cache.h')
| -rw-r--r-- | cache.h | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -464,7 +464,9 @@ extern int index_name_is_other(const struct index_state *, const char *, int); /* do stat comparison even if CE_VALID is true */ #define CE_MATCH_IGNORE_VALID 01 /* do not check the contents but report dirty on racily-clean entries */ -#define CE_MATCH_RACY_IS_DIRTY 02 +#define CE_MATCH_RACY_IS_DIRTY 02 +/* do stat comparison even if CE_SKIP_WORKTREE is true */ +#define CE_MATCH_IGNORE_SKIP_WORKTREE 04 extern int ie_match_stat(const struct index_state *, struct cache_entry *, struct stat *, unsigned int); extern int ie_modified(const struct index_state *, struct cache_entry *, struct stat *, unsigned int); |