[PATCH 13/15] refs.c: make add_packed_ref return an error instead of calling die
- From
Ronnie Sahlberg <sahlberg@google.com>
- Date
- Oct 21, 2014, 20:36 UTC
- Message-ID
- <1413923820-14457-14-git-send-email-sahlberg@google.com>
- In-Reply-To
- <1413923820-14457-1-git-send-email-sahlberg@google.com>
Change add_packed_ref to return an error instead of calling die(). Update all callers to check the return value of add_packed_ref.
Change-Id: I5d5e4a75f641c4bbdb59199a233b71e86361c25c Signed-off-by: Ronnie Sahlberg <sahlberg@google.com> --- refs.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/refs.c b/refs.c index c7d0825..e0d5a82 100644 --- a/refs.c +++ b/refs.c @@ -1224,15 +1224,16 @@ static struct ref_dir *get_packed_refs(struct ref_cache *refs) return get_packed_ref_dir(get_packed_ref_cache(refs)); } -static void add_packed_ref(const char *refname, const unsigned char *sha1) +static int add_packed_ref(const char *refname, const unsigned char *sha1) { struct packed_ref_cache *packed_ref_cache = get_packed_ref_cache(&ref_cache); if (!packed_ref_cache->lock) - die("internal error: packed refs not locked"); + return -1; add_ref(get_packed_ref_dir(packed_ref_cache), create_ref_entry(refname, sha1, REF_ISPACKED, 1)); + return 0; } /* @@ -3795,7 +3796,13 @@ int transaction_commit(struct transaction *transaction, sha1, NULL)) continue; - add_packed_ref(update->refname, sha1); + if (add_packed_ref(update->refname, sha1)) { + if (err) + strbuf_addf(err, "Failed to add %s to packed " + "refs", update->refname); + ret = -1; + goto cleanup; + } need_repack = 1; } if (need_repack) { @@ -3909,7 +3916,13 @@ int transaction_commit(struct transaction *transaction, packed = get_packed_refs(&ref_cache); remove_entry(packed, update->refname); - add_packed_ref(update->refname, update->new_sha1); + if (add_packed_ref(update->refname, update->new_sha1)) { + if (err) + strbuf_addf(err, "Failed to add %s to packed " + "refs", update->refname); + ret = -1; + goto cleanup; + } need_repack = 1; try_remove_empty_parents((char *)update->refname);
-- 2.1.0.rc2.206.gedb03e5