From a1754bcce98fa57b9374440c2717ec1159ed8ffb Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Wed, 1 Oct 2014 12:28:19 +0200 Subject: remove_lock_file(): call rollback_lock_file() It does just what we need. Signed-off-by: Michael Haggerty Reviewed-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- lockfile.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'lockfile.c') diff --git a/lockfile.c b/lockfile.c index a8f32e5495..f8205f6b03 100644 --- a/lockfile.c +++ b/lockfile.c @@ -53,12 +53,8 @@ static void remove_lock_file(void) pid_t me = getpid(); while (lock_file_list) { - if (lock_file_list->owner == me && - lock_file_list->filename[0]) { - if (lock_file_list->fd >= 0) - close(lock_file_list->fd); - unlink_or_warn(lock_file_list->filename); - } + if (lock_file_list->owner == me) + rollback_lock_file(lock_file_list); lock_file_list = lock_file_list->next; } } -- cgit v1.2.3