From 1831cf12154a830496e0de70eaaaeb260f465b82 Mon Sep 17 00:00:00 2001 From: Ronnie Sahlberg Date: Fri, 7 Nov 2014 11:39:05 -0800 Subject: refs.c: add an err argument to pack_refs Signed-off-by: Ronnie Sahlberg Signed-off-by: Junio C Hamano --- refs.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'refs.c') diff --git a/refs.c b/refs.c index d69b8260ec..1d0b80d504 100644 --- a/refs.c +++ b/refs.c @@ -2593,16 +2593,15 @@ static void prune_refs(struct ref_to_prune *r) } } -int pack_refs(unsigned int flags) +int pack_refs(unsigned int flags, struct strbuf *err) { struct pack_refs_cb_data cbdata; - struct strbuf err = STRBUF_INIT; memset(&cbdata, 0, sizeof(cbdata)); cbdata.flags = flags; - if (lock_packed_refs(&err)) - die("%s", err.buf); + if (lock_packed_refs(err)) + return -1; cbdata.packed_refs = get_packed_refs(&ref_cache); -- cgit v1.2.1