diff options
author | Junio C Hamano <gitster@pobox.com> | 2007-11-10 00:15:03 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2007-11-10 00:24:51 -0800 |
commit | 4bd5b7dacc404e6b733d9ab6744429c5027bb5e1 (patch) | |
tree | ffdf76686afbd17249255cce00e1ede134212821 /entry.c | |
parent | d048a96ee9bec968be0bdc9c43ffce61169545be (diff) | |
download | git-4bd5b7dacc404e6b733d9ab6744429c5027bb5e1.tar.gz git-4bd5b7dacc404e6b733d9ab6744429c5027bb5e1.tar.xz |
ce_match_stat, run_diff_files: use symbolic constants for readability
ce_match_stat() can be told:
(1) to ignore CE_VALID bit (used under "assume unchanged" mode)
and perform the stat comparison anyway;
(2) not to perform the contents comparison for racily clean
entries and report mismatch of cached stat information;
using its "option" parameter. Give them symbolic constants.
Similarly, run_diff_files() can be told not to report anything
on removed paths. Also give it a symbolic constant for that.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'entry.c')
-rw-r--r-- | entry.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -200,7 +200,7 @@ int checkout_entry(struct cache_entry *ce, const struct checkout *state, char *t strcpy(path + len, ce->name); if (!lstat(path, &st)) { - unsigned changed = ce_match_stat(ce, &st, 1); + unsigned changed = ce_match_stat(ce, &st, CE_MATCH_IGNORE_VALID); if (!changed) return 0; if (!state->force) { |