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 /write-tree.c | |
| parent | Merge branch 'js/portable' (diff) | |
| parent | cache_name_compare() compares name and stage, nothing else. (diff) | |
| download | git-ee072260dbff6914c24d956bcc2d46882831f1a0.tar.gz git-ee072260dbff6914c24d956bcc2d46882831f1a0.zip | |
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 'write-tree.c')
| -rw-r--r-- | write-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/write-tree.c b/write-tree.c index f866059f24..addb5de3b6 100644 --- a/write-tree.c +++ b/write-tree.c @@ -111,7 +111,7 @@ int main(int argc, char **argv) funny = 0; for (i = 0; i < entries; i++) { struct cache_entry *ce = active_cache[i]; - if (ntohs(ce->ce_flags) & ~CE_NAMEMASK) { + if (ce_stage(ce)) { if (10 < ++funny) { fprintf(stderr, "...\n"); break; |