mirror of
https://github.com/git/git
synced 2024-08-24 02:11:08 +00:00
rollback_lock_file(): set fd to -1
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:
parent
9085f8e279
commit
26f5d3b65f
|
@ -279,8 +279,7 @@ void rollback_lock_file(struct lock_file *lk)
|
|||
if (!lk->filename[0])
|
||||
return;
|
||||
|
||||
if (lk->fd >= 0)
|
||||
close(lk->fd);
|
||||
close_lock_file(lk);
|
||||
unlink_or_warn(lk->filename);
|
||||
lk->filename[0] = 0;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue