diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2014-10-01 12:28:09 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-01 13:38:40 -0700 |
| commit | 9085f8e279146a31ea8bbd102b6c97f5cb22dcdc (patch) | |
| tree | 879088795b5ed97a30a61da366bebed02413dc94 | |
| parent | 5527d5349b42aeb2ea36edfd2d55016f22fefc08 (diff) | |
| download | git-9085f8e279146a31ea8bbd102b6c97f5cb22dcdc.tar.gz | |
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>
| -rw-r--r-- | lockfile.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lockfile.c b/lockfile.c index 5330d6ae52..e55149a73a 100644 --- a/lockfile.c +++ b/lockfile.c @@ -276,10 +276,11 @@ int hold_locked_index(struct lock_file *lk, int die_on_error) void rollback_lock_file(struct lock_file *lk) { - if (lk->filename[0]) { - if (lk->fd >= 0) - close(lk->fd); - unlink_or_warn(lk->filename); - lk->filename[0] = 0; - } + if (!lk->filename[0]) + return; + + if (lk->fd >= 0) + close(lk->fd); + unlink_or_warn(lk->filename); + lk->filename[0] = 0; } |