From: Ronnie Sahlberg Date: Fri, 25 Jul 2014 16:58:41 GMT Subject: [PATCH 5/5] refs.c: rollback the lockfile before we die() in repack_without_refs Message-ID: <1406307521-10339-6-git-send-email-sahlberg@google.com> In-Reply-To: <1406307521-10339-1-git-send-email-sahlberg@google.com> Signed-off-by: Ronnie Sahlberg --- refs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/refs.c b/refs.c index a5053bf..619725a 100644 --- a/refs.c +++ b/refs.c @@ -2570,8 +2570,10 @@ int repack_without_refs(const char **refnames, int n, 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.0.1.508.g763ab16