diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2014-10-01 10:28:07 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-01 20:38:39 (GMT) |
| commit | 419f0c0f681b76d720699977abe03d29e22db554 (patch) | |
| tree | fe326a207ecc55c8103f28a07617eb542411427f /read-cache.c | |
| parent | a5e48669a2bb45e3a2a6daf30635270b90056085 (diff) | |
| download | git-419f0c0f681b76d720699977abe03d29e22db554.zip git-419f0c0f681b76d720699977abe03d29e22db554.tar.gz git-419f0c0f681b76d720699977abe03d29e22db554.tar.bz2 | |
close_lock_file(): exit (successfully) if file is already closed
Suggested-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 2fc1182..5ffb1d7 100644 --- a/read-cache.c +++ b/read-cache.c @@ -2042,7 +2042,7 @@ void set_alternate_index_output(const char *name) static int commit_locked_index(struct lock_file *lk) { if (alternate_index_output) { - if (lk->fd >= 0 && close_lock_file(lk)) + if (close_lock_file(lk)) return -1; if (rename(lk->filename, alternate_index_output)) return -1; |