Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'lockfile.c')
-rw-r--r--lockfile.c13
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;
}