diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-03-17 18:54:31 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-03-17 18:54:31 -0700 |
commit | a9bfe813094cf2c8ea0e30c3196070c868fb294c (patch) | |
tree | 143c940f6059792b1ccb044db31e82206bd1477c /diff-lib.c | |
parent | 642d0844b9795ca7b1424f4afc8d8c86abd7bf34 (diff) | |
parent | 381b920b8ac1440962f340cba9030e2dc3130c49 (diff) | |
download | git-a9bfe813094cf2c8ea0e30c3196070c868fb294c.tar.gz |
Merge branch 'kb/checkout-optim'
* kb/checkout-optim:
Revert "lstat_cache(): print a warning if doing ping-pong between cache types"
checkout bugfix: use stat.mtime instead of stat.ctime in two places
Makefile: Set compiler switch for USE_NSEC
Create USE_ST_TIMESPEC and turn it on for Darwin
Not all systems use st_[cm]tim field for ns resolution file timestamp
Record ns-timestamps if possible, but do not use it without USE_NSEC
write_index(): update index_state->timestamp after flushing to disk
verify_uptodate(): add ce_uptodate(ce) test
make USE_NSEC work as expected
fix compile error when USE_NSEC is defined
check_updates(): effective removal of cache entries marked CE_REMOVE
lstat_cache(): print a warning if doing ping-pong between cache types
show_patch_diff(): remove a call to fstat()
write_entry(): use fstat() instead of lstat() when file is open
write_entry(): cleanup of some duplicated code
create_directories(): remove some memcpy() and strchr() calls
unlink_entry(): introduce schedule_dir_for_removal()
lstat_cache(): swap func(length, string) into func(string, length)
lstat_cache(): generalise longest_match_lstat_cache()
lstat_cache(): small cleanup and optimisation
Diffstat (limited to 'diff-lib.c')
-rw-r--r-- | diff-lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/diff-lib.c b/diff-lib.c index 79d0606834..a310fb2ad0 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -31,7 +31,7 @@ static int check_removed(const struct cache_entry *ce, struct stat *st) return -1; return 1; } - if (has_symlink_leading_path(ce_namelen(ce), ce->name)) + if (has_symlink_leading_path(ce->name, ce_namelen(ce))) return 1; if (S_ISDIR(st->st_mode)) { unsigned char sub[20]; |