summaryrefslogtreecommitdiff
path: root/read-cache.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-08-13 01:34:36 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-08-13 01:35:14 (GMT)
commiteed94a570e0421175d6b4342c0ac48e03ceedf0b (patch)
treef33864f2abffdcb83cbf626b26da34f9cc8d5bab /read-cache.c
parent4147d801db66df9b127ffe315601f467aa9d1c48 (diff)
parent01aaf1f88ddc2b99162c302710339f202996f39b (diff)
downloadgit-eed94a570e0421175d6b4342c0ac48e03ceedf0b.zip
git-eed94a570e0421175d6b4342c0ac48e03ceedf0b.tar.gz
git-eed94a570e0421175d6b4342c0ac48e03ceedf0b.tar.bz2
Merge branch 'master' into js/c-merge-recursive
Adjust to hold_lock_file_for_update() change on the master.
Diffstat (limited to 'read-cache.c')
-rw-r--r--read-cache.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/read-cache.c b/read-cache.c
index fc2af2c..c575eda 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -61,7 +61,7 @@ static int ce_compare_data(struct cache_entry *ce, struct stat *st)
unsigned char sha1[20];
if (!index_fd(sha1, fd, st, 0, NULL))
match = memcmp(sha1, ce->sha1, 20);
- close(fd);
+ /* index_fd() closed the file descriptor already */
}
return match;
}