kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

rollback_lock_file(): exit early if lock is not active 

Eliminate a layer of nesting.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Reviewed-by: Ronnie Sahlberg <sahlberg@google.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Michael Haggerty 2014-10-01 12:28:09 +02:00 committed by Junio C Hamano
parent 5527d5349b
commit 9085f8e279
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lockfile.c
View File

@ -276,10 +276,11 @@ int hold_locked_index(struct lock_file *lk, int die_on_error)


void rollback_lock_file(struct lock_file *lk) void rollback_lock_file(struct lock_file *lk)
{ {
if (lk->filename[0]) { if (!lk->filename[0])
if (lk->fd >= 0) return;
close(lk->fd);
unlink_or_warn(lk->filename); if (lk->fd >= 0)
lk->filename[0] = 0; close(lk->fd);
} unlink_or_warn(lk->filename);
lk->filename[0] = 0;
} }