diff options
| author | Ronnie Sahlberg <sahlberg@google.com> | 2014-11-07 11:38:56 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-11-07 15:46:22 -0800 |
| commit | 3a1f6e3795cc359dbcd90c16e598cd7937c0439b (patch) | |
| tree | c32bf5395f368442628e88f2e5322bc3f90d6862 | |
| parent | 994a7b0b2d9479268ad84704d1475e86600c9416 (diff) | |
| download | git-3a1f6e3795cc359dbcd90c16e598cd7937c0439b.tar.gz | |
refs.c: rollback the lockfile before we die() in repack_without_refs
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | refs.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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 */ |