refs.c: add an err argument to delete_ref_loose

Add an err argument to delete_ref_loose 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_ref_loose.

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>

diff --git a/refs.c b/refs.c
index 4f2564dffab13a838986d48105eee9219e4da9bb..430857b475901cd3a850e8a016bf0af8fb72a066 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -2597,7 +2597,7 @@ int repack_without_refs(const char **refnames, int n, struct strbuf *err)
        return ret;
 }
 
        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) {
                /*
 {
        if (!(flag & REF_ISPACKED) || flag & REF_ISSYMREF) {
                /*


@@ -2605,9 +2605,9 @@ static int delete_ref_loose(struct ref_lock *lock, int flag)
                 * lockfile name, minus ".lock":
                 */
                char *loose_filename = get_locked_file_path(lock->lk);
                 * lockfile name, minus ".lock":
                 */
                char *loose_filename = get_locked_file_path(lock->lk);

-               int err = unlink_or_warn(loose_filename);
+               int res = unlink_or_msg(loose_filename, err);

                free(loose_filename);
                free(loose_filename);

-               if (err)
+               if (res)

                        return 1;
        }
        return 0;
                        return 1;
        }
        return 0;


@@ -3658,7 +3658,8 @@ int ref_transaction_commit(struct ref_transaction *transaction,
                struct ref_update *update = updates[i];
 
                if (update->lock) {
                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;
                }
                        if (!(update->flags & REF_ISPRUNING))
                                delnames[delnum++] = update->lock->ref_name;
                }