From: Ronnie Sahlberg <sahlberg@google.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, Ronnie Sahlberg <sahlberg@google.com>
Subject: [PATCH 5/5] refs.c: rollback the lockfile before we die() in repack_without_refs
Date: Fri, 25 Jul 2014 09:58:41 -0700 [thread overview]
Message-ID: <1406307521-10339-6-git-send-email-sahlberg@google.com> (raw)
In-Reply-To: <1406307521-10339-1-git-send-email-sahlberg@google.com>
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
---
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
prev parent reply other threads:[~2014-07-25 16:59 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-25 16:58 [PATCH 0/5] ref-transactions-rename Ronnie Sahlberg
2014-07-25 16:58 ` [PATCH 1/5] refs.c: allow passing raw git_committer_info as email to _update_reflog Ronnie Sahlberg
2014-07-25 19:37 ` Jonathan Nieder
2014-07-28 18:01 ` Ronnie Sahlberg
2014-07-28 23:39 ` Eric Sunshine
2014-07-25 16:58 ` [PATCH 2/5] refs.c: return error instead of dying when locking fails during transaction Ronnie Sahlberg
2014-07-25 19:40 ` Jonathan Nieder
2014-07-28 19:01 ` Ronnie Sahlberg
2014-07-25 16:58 ` [PATCH 3/5] refs.c: use packed refs when deleting refs during a transaction Ronnie Sahlberg
2014-07-25 19:58 ` Jonathan Nieder
2014-07-25 16:58 ` [PATCH 4/5] refs.c: update rename_ref to use " Ronnie Sahlberg
2014-07-25 20:00 ` Jonathan Nieder
2014-07-25 16:58 ` Ronnie Sahlberg [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1406307521-10339-6-git-send-email-sahlberg@google.com \
--to=sahlberg@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.