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

rollback_lock_file(): set fd to -1

Browse Source 
When rolling back the lockfile, call close_lock_file() so that the
lock_file's fd field gets set back to -1. This keeps the lock_file
object in a valid state, which is important because these objects are
allowed to be reused. It also makes it unnecessary to check whether
the file has already been closed, because close_lock_file() takes care
of that.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Haggerty 2014-10-01 12:28:10 +02:00 committed by Junio C Hamano
parent 9085f8e279
commit 26f5d3b65f
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lockfile.c
View File

@ -279,8 +279,7 @@ void rollback_lock_file(struct lock_file *lk)
if (!lk->filename[0]) if (!lk->filename[0])
return; return;
if (lk->fd >= 0) close_lock_file(lk);
close(lk->fd);
unlink_or_warn(lk->filename); unlink_or_warn(lk->filename);
lk->filename[0] = 0; lk->filename[0] = 0;
} }