summaryrefslogtreecommitdiff
path: root/combine-diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-03-18 01:54:31 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-03-18 01:54:31 (GMT)
commita9bfe813094cf2c8ea0e30c3196070c868fb294c (patch)
tree143c940f6059792b1ccb044db31e82206bd1477c /combine-diff.c
parent642d0844b9795ca7b1424f4afc8d8c86abd7bf34 (diff)
parent381b920b8ac1440962f340cba9030e2dc3130c49 (diff)
downloadgit-a9bfe813094cf2c8ea0e30c3196070c868fb294c.zip
git-a9bfe813094cf2c8ea0e30c3196070c868fb294c.tar.gz
git-a9bfe813094cf2c8ea0e30c3196070c868fb294c.tar.bz2
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 'combine-diff.c')
-rw-r--r--combine-diff.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/combine-diff.c b/combine-diff.c
index b3b86ae..066ce84 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -712,9 +712,7 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
result_size = buf.len;
result = strbuf_detach(&buf, NULL);
elem->mode = canon_mode(st.st_mode);
- }
- else if (0 <= (fd = open(elem->path, O_RDONLY)) &&
- !fstat(fd, &st)) {
+ } else if (0 <= (fd = open(elem->path, O_RDONLY))) {
size_t len = xsize_t(st.st_size);
ssize_t done;
int is_file, i;