remove_lock_file(): call rollback_lock_file()
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>
Michael Haggerty committed
Oct 1, 2014 at 12:28 UTC
a1754bcce98fa57b9374440c2717ec1159ed8ffb
1 file changed
+2
-6
lockfile.c
+2
-6
@@ -53,12 +53,8 @@ static void remove_lock_file(void)
53
pid_t me = getpid();
54
55
while (lock_file_list) {
56
- if (lock_file_list->owner == me &&
57
- lock_file_list->filename[0]) {
58
- if (lock_file_list->fd >= 0)
59
- close(lock_file_list->fd);
60
- unlink_or_warn(lock_file_list->filename);
61
- }
56
+ if (lock_file_list->owner == me)
57
+ rollback_lock_file(lock_file_list);
58
lock_file_list = lock_file_list->next;
59
}
60
}