diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-08-13 03:34:36 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-13 03:35:14 +0200 |
| commit | eed94a570e0421175d6b4342c0ac48e03ceedf0b (patch) | |
| tree | f33864f2abffdcb83cbf626b26da34f9cc8d5bab /read-cache.c | |
| parent | discard_cache(): discard index, even if no file was mmap()ed (diff) | |
| parent | GIT 1.4.2 (diff) | |
| download | git-eed94a570e0421175d6b4342c0ac48e03ceedf0b.tar.xz git-eed94a570e0421175d6b4342c0ac48e03ceedf0b.zip | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/read-cache.c b/read-cache.c index fc2af2cb04..c575edac49 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; } |