undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

close_lock_file(): exit (successfully) if file is already closed

Browse Source 
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>
This commit is contained in:
Michael Haggerty 2014-10-01 12:28:07 +02:00 committed by Junio C Hamano
parent a5e48669a2
commit 419f0c0f68
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lockfile.c
View File

@ -233,6 +233,10 @@ int hold_lock_file_for_append(struct lock_file *lk, const char *path, int flags)
int close_lock_file(struct lock_file *lk)
{
int fd = lk->fd;
if (fd < 0)
return 0;
lk->fd = -1;
return close(fd);
}
@ -251,7 +255,7 @@ int commit_lock_file(struct lock_file *lk)
{
char result_file[PATH_MAX];
size_t i;
if (lk->fd >= 0 && close_lock_file(lk))
if (close_lock_file(lk))
return -1;
strcpy(result_file, lk->filename);
i = strlen(result_file) - 5; /* .lock */

2
read-cache.c
View File

@ -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;