diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-02-21 22:33:21 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-21 22:33:21 -0800 |
| commit | ee072260dbff6914c24d956bcc2d46882831f1a0 (patch) | |
| tree | 903879eab78ae085ccb956299d6d8007e4427cee /diff.c | |
| parent | 712b1dd389ad5bcdbaab0279641f0970702fc1f1 (diff) | |
| parent | 7b80be150ce137a790f498a69a784d61d8fc2e78 (diff) | |
| download | git-ee072260dbff6914c24d956bcc2d46882831f1a0.tar.gz git-ee072260dbff6914c24d956bcc2d46882831f1a0.tar.xz | |
Merge branch 'jc/nostat'
* jc/nostat:
cache_name_compare() compares name and stage, nothing else.
"assume unchanged" git: documentation.
ls-files: split "show-valid-bit" into a different option.
"Assume unchanged" git: --really-refresh fix.
ls-files: debugging aid for CE_VALID changes.
"Assume unchanged" git: do not set CE_VALID with --refresh
"Assume unchanged" git
Diffstat (limited to 'diff.c')
| -rw-r--r-- | diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -311,7 +311,7 @@ static int work_tree_matches(const char *name, const unsigned char *sha1) ce = active_cache[pos]; if ((lstat(name, &st) < 0) || !S_ISREG(st.st_mode) || /* careful! */ - ce_match_stat(ce, &st) || + ce_match_stat(ce, &st, 0) || memcmp(sha1, ce->sha1, 20)) return 0; /* we return 1 only when we can stat, it is a regular file, |