[PATCH 03/12] refs.c: add an err argument to delete_ref_loose
- From
Ronnie Sahlberg <sahlberg@google.com>
- Date
- Jul 16, 2014, 22:23 UTC
- Message-ID
- <1405549392-27306-4-git-send-email-sahlberg@google.com>
- In-Reply-To
- <1405549392-27306-1-git-send-email-sahlberg@google.com>
Add an err argument to delete_loose_ref so that we can pass a descriptive error string back to the caller. Pass the err argument from transaction commit to this function so that transaction users will have a nice error string if the transaction failed due to delete_loose_ref.
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com> --- refs.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/refs.c b/refs.c index 0017d9c..24f9546 100644 --- a/refs.c +++ b/refs.c @@ -2544,16 +2544,16 @@ int repack_without_refs(const char **refnames, int n, struct strbuf *err) return ret; } -static int delete_ref_loose(struct ref_lock *lock, int flag) +static int delete_ref_loose(struct ref_lock *lock, int flag, struct strbuf *err) { if (!(flag & REF_ISPACKED) || flag & REF_ISSYMREF) { /* loose */ - int err, i = strlen(lock->lk->filename) - 5; /* .lock */ + int res, i = strlen(lock->lk->filename) - 5; /* .lock */ lock->lk->filename[i] = 0; - err = unlink_or_warn(lock->lk->filename); + res = unlink_or_msg(lock->lk->filename, err); lock->lk->filename[i] = '.'; - if (err && errno != ENOENT) + if (res) return 1; } return 0; @@ -3602,7 +3602,8 @@ int ref_transaction_commit(struct ref_transaction *transaction, struct ref_update *update = updates[i]; if (update->lock) { - ret |= delete_ref_loose(update->lock, update->type); + ret |= delete_ref_loose(update->lock, update->type, + err); if (!(update->flags & REF_ISPRUNING)) delnames[delnum++] = update->lock->ref_name; }
-- 2.0.1.527.gc6b782e