admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove_lock_file(): call rollback_lock_file()

Browse Source 
It does just what we need.

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:
Michael Haggerty
2014-10-01 12:28:19 +02:00
committed by Junio C Hamano
parent e31e949b9f
commit a1754bcce9
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lockfile.c
View File

@@ -53,12 +53,8 @@ static void remove_lock_file(void)
pid_t me = getpid(); pid_t me = getpid();
while (lock_file_list) { while (lock_file_list) {
if (lock_file_list->owner == me && if (lock_file_list->owner == me)
lock_file_list->filename[0]) { rollback_lock_file(lock_file_list);
if (lock_file_list->fd >= 0)
close(lock_file_list->fd);
unlink_or_warn(lock_file_list->filename);
}
lock_file_list = lock_file_list->next; lock_file_list = lock_file_list->next;
} }
} }