From: Stefan Beller Date: Tue, 18 Nov 2014 01:44:48 GMT Subject: [PATCH v4 07/16] refs.c: rollback the lockfile before we die() in repack_without_refs Message-ID: <1416275097-3616-8-git-send-email-sbeller@google.com> In-Reply-To: <1416275097-3616-1-git-send-email-sbeller@google.com> From: Ronnie Sahlberg Signed-off-by: Ronnie Sahlberg Signed-off-by: Jonathan Nieder Signed-off-by: Stefan Beller --- refs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/refs.c b/refs.c index 780acd5..2db1dff 100644 --- a/refs.c +++ b/refs.c @@ -2707,8 +2707,10 @@ int repack_without_refs(struct string_list *without, struct strbuf *err) /* Remove any other accumulated cruft */ do_for_each_entry_in_dir(packed, 0, curate_packed_ref_fn, &refs_to_delete); for_each_string_list_item(ref_to_delete, &refs_to_delete) { - if (remove_entry(packed, ref_to_delete->string) == -1) + if (remove_entry(packed, ref_to_delete->string) == -1) { + rollback_packed_refs(); die("internal error"); + } } /* Write what remains */ -- 2.2.0.rc2.5.gf7b9fb2