refs: convert delete_ref and refs_delete_ref to struct object_id

Convert delete_ref and refs_delete_ref to take a pointer to struct
object_id.  Update the documentation accordingly, including referring to
null_oid in lowercase, as it is not a #define constant.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/branch.c b/builtin/branch.c
index b67593288cf54084b569763ba2ef8e3b2cf9aa97..f5237541a224f97a2e35cd232b522de9a5b16ea7 100644 (file)
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -257,7 +257,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
                        goto next;
                }
 
                        goto next;
                }
 

-               if (delete_ref(NULL, name, is_null_oid(&oid) ? NULL : oid.hash,
+               if (delete_ref(NULL, name, is_null_oid(&oid) ? NULL : &oid,

                               REF_NODEREF)) {
                        error(remote_branch
                              ? _("Error deleting remote-tracking branch '%s'")
                               REF_NODEREF)) {
                        error(remote_branch
                              ? _("Error deleting remote-tracking branch '%s'")

diff --git a/builtin/replace.c b/builtin/replace.c
index 3e71a771523d8566590bfbd5de71b08acf79e3a4..2854eaa0f3b05449a3fd7f42b41f80b9114daeca 100644 (file)
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -128,7 +128,7 @@ static int for_each_replace_name(const char **argv, each_replace_name_fn fn)
 static int delete_replace_ref(const char *name, const char *ref,
                              const struct object_id *oid)
 {
 static int delete_replace_ref(const char *name, const char *ref,
                              const struct object_id *oid)
 {

-       if (delete_ref(NULL, ref, oid->hash, 0))
+       if (delete_ref(NULL, ref, oid, 0))

                return 1;
        printf("Deleted replace ref '%s'\n", name);
        return 0;
                return 1;
        printf("Deleted replace ref '%s'\n", name);
        return 0;

diff --git a/builtin/reset.c b/builtin/reset.c
index 9cd89b23059f768c4651725f2c26c5b08c35f650..5f3632e05b9d506069e2ff97c3ad01f82764ddd2 100644 (file)
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -269,7 +269,7 @@ static int reset_refs(const char *rev, const struct object_id *oid)
                update_ref_oid(msg.buf, "ORIG_HEAD", orig, old_orig, 0,
                           UPDATE_REFS_MSG_ON_ERR);
        } else if (old_orig)
                update_ref_oid(msg.buf, "ORIG_HEAD", orig, old_orig, 0,
                           UPDATE_REFS_MSG_ON_ERR);
        } else if (old_orig)

-               delete_ref(NULL, "ORIG_HEAD", old_orig->hash, 0);
+               delete_ref(NULL, "ORIG_HEAD", old_orig, 0);

        set_reflog_message(&msg, "updating HEAD", rev);
        update_ref_status = update_ref_oid(msg.buf, "HEAD", oid, orig, 0,
                                       UPDATE_REFS_MSG_ON_ERR);
        set_reflog_message(&msg, "updating HEAD", rev);
        update_ref_status = update_ref_oid(msg.buf, "HEAD", oid, orig, 0,
                                       UPDATE_REFS_MSG_ON_ERR);

diff --git a/builtin/tag.c b/builtin/tag.c
index 695cb0778e2cad52d829030b00f91a4b230224e1..272f0d31037c861db5982ed0fd98177d406001c6 100644 (file)
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -97,7 +97,7 @@ static int for_each_tag_name(const char **argv, each_tag_name_fn fn,
 static int delete_tag(const char *name, const char *ref,
                      const struct object_id *oid, const void *cb_data)
 {
 static int delete_tag(const char *name, const char *ref,
                      const struct object_id *oid, const void *cb_data)
 {

-       if (delete_ref(NULL, ref, oid->hash, 0))
+       if (delete_ref(NULL, ref, oid, 0))

                return 1;
        printf(_("Deleted tag '%s' (was %s)\n"), name, find_unique_abbrev(oid->hash, DEFAULT_ABBREV));
        return 0;
                return 1;
        printf(_("Deleted tag '%s' (was %s)\n"), name, find_unique_abbrev(oid->hash, DEFAULT_ABBREV));
        return 0;

diff --git a/builtin/update-ref.c b/builtin/update-ref.c
index 6b90c5deadb62600aa08166f500bde24cb800fbf..bf0f80ebae7429cc49f51f1ddc205f29893589d6 100644 (file)
--- a/builtin/update-ref.c
+++ b/builtin/update-ref.c
@@ -434,7 +434,7 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix)
                 * NULL_SHA1 as "don't care" here:
                 */
                return delete_ref(msg, refname,
                 * NULL_SHA1 as "don't care" here:
                 */
                return delete_ref(msg, refname,

-                                 (oldval && !is_null_oid(&oldoid)) ? oldoid.hash : NULL,
+                                 (oldval && !is_null_oid(&oldoid)) ? &oldoid : NULL,

                                  flags);
        else
                return update_ref(msg, refname, oid.hash, oldval ? oldoid.hash : NULL,
                                  flags);
        else
                return update_ref(msg, refname, oid.hash, oldval ? oldoid.hash : NULL,

diff --git a/refs.c b/refs.c
index c590a992fb19ce92dcf0932b58f83b65028f8316..25170d9143bfb7ffd5139fa7ba660bac9663942d 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -620,25 +620,25 @@ static int write_pseudoref(const char *pseudoref, const unsigned char *sha1,
        return ret;
 }
 
        return ret;
 }
 

-static int delete_pseudoref(const char *pseudoref, const unsigned char *old_sha1)
+static int delete_pseudoref(const char *pseudoref, const struct object_id *old_oid)

 {
        static struct lock_file lock;
        const char *filename;
 
        filename = git_path("%s", pseudoref);
 
 {
        static struct lock_file lock;
        const char *filename;
 
        filename = git_path("%s", pseudoref);
 

-       if (old_sha1 && !is_null_sha1(old_sha1)) {
+       if (old_oid && !is_null_oid(old_oid)) {

                int fd;
                int fd;

-               unsigned char actual_old_sha1[20];
+               struct object_id actual_old_oid;

 
                fd = hold_lock_file_for_update_timeout(
                                &lock, filename, LOCK_DIE_ON_ERROR,
                                get_files_ref_lock_timeout_ms());
                if (fd < 0)
                        die_errno(_("Could not open '%s' for writing"), filename);
 
                fd = hold_lock_file_for_update_timeout(
                                &lock, filename, LOCK_DIE_ON_ERROR,
                                get_files_ref_lock_timeout_ms());
                if (fd < 0)
                        die_errno(_("Could not open '%s' for writing"), filename);

-               if (read_ref(pseudoref, actual_old_sha1))
+               if (read_ref(pseudoref, actual_old_oid.hash))

                        die("could not read ref '%s'", pseudoref);
                        die("could not read ref '%s'", pseudoref);

-               if (hashcmp(actual_old_sha1, old_sha1)) {
+               if (oidcmp(&actual_old_oid, old_oid)) {

                        warning("Unexpected sha1 when deleting %s", pseudoref);
                        rollback_lock_file(&lock);
                        return -1;
                        warning("Unexpected sha1 when deleting %s", pseudoref);
                        rollback_lock_file(&lock);
                        return -1;


@@ -655,7 +655,7 @@ static int delete_pseudoref(const char *pseudoref, const unsigned char *old_sha1
 
 int refs_delete_ref(struct ref_store *refs, const char *msg,
                    const char *refname,
 
 int refs_delete_ref(struct ref_store *refs, const char *msg,
                    const char *refname,

-                   const unsigned char *old_sha1,
+                   const struct object_id *old_oid,

                    unsigned int flags)
 {
        struct ref_transaction *transaction;
                    unsigned int flags)
 {
        struct ref_transaction *transaction;


@@ -663,12 +663,13 @@ int refs_delete_ref(struct ref_store *refs, const char *msg,
 
        if (ref_type(refname) == REF_TYPE_PSEUDOREF) {
                assert(refs == get_main_ref_store());
 
        if (ref_type(refname) == REF_TYPE_PSEUDOREF) {
                assert(refs == get_main_ref_store());

-               return delete_pseudoref(refname, old_sha1);
+               return delete_pseudoref(refname, old_oid);

        }
 
        transaction = ref_store_transaction_begin(refs, &err);
        if (!transaction ||
        }
 
        transaction = ref_store_transaction_begin(refs, &err);
        if (!transaction ||

-           ref_transaction_delete(transaction, refname, old_sha1,
+           ref_transaction_delete(transaction, refname,
+                                  old_oid ? old_oid->hash : NULL,

                                   flags, msg, &err) ||
            ref_transaction_commit(transaction, &err)) {
                error("%s", err.buf);
                                   flags, msg, &err) ||
            ref_transaction_commit(transaction, &err)) {
                error("%s", err.buf);


@@ -682,10 +683,10 @@ int refs_delete_ref(struct ref_store *refs, const char *msg,
 }
 
 int delete_ref(const char *msg, const char *refname,
 }
 
 int delete_ref(const char *msg, const char *refname,

-              const unsigned char *old_sha1, unsigned int flags)
+              const struct object_id *old_oid, unsigned int flags)

 {
        return refs_delete_ref(get_main_ref_store(), msg, refname,
 {
        return refs_delete_ref(get_main_ref_store(), msg, refname,

-                              old_sha1, flags);
+                              old_oid, flags);

 }
 
 int copy_reflog_msg(char *buf, const char *msg)
 }
 
 int copy_reflog_msg(char *buf, const char *msg)

diff --git a/refs.h b/refs.h
index a02b628c8fe81b648f13c66b7e618d8660151e77..09575fc2bf6f0459b399abdb15fae1d3bfcce087 100644 (file)
--- a/refs.h
+++ b/refs.h
@@ -371,19 +371,19 @@ int refs_reflog_exists(struct ref_store *refs, const char *refname);
 int reflog_exists(const char *refname);
 
 /*
 int reflog_exists(const char *refname);
 
 /*

- * Delete the specified reference. If old_sha1 is non-NULL, then
+ * Delete the specified reference. If old_oid is non-NULL, then

  * verify that the current value of the reference is old_sha1 before
  * verify that the current value of the reference is old_sha1 before

- * deleting it. If old_sha1 is NULL, delete the reference if it
- * exists, regardless of its old value. It is an error for old_sha1 to
- * be NULL_SHA1. msg and flags are passed through to
+ * deleting it. If old_oid is NULL, delete the reference if it
+ * exists, regardless of its old value. It is an error for old_oid to
+ * be null_oid. msg and flags are passed through to

  * ref_transaction_delete().
  */
 int refs_delete_ref(struct ref_store *refs, const char *msg,
                    const char *refname,
  * ref_transaction_delete().
  */
 int refs_delete_ref(struct ref_store *refs, const char *msg,
                    const char *refname,

-                   const unsigned char *old_sha1,
+                   const struct object_id *old_oid,

                    unsigned int flags);
 int delete_ref(const char *msg, const char *refname,
                    unsigned int flags);
 int delete_ref(const char *msg, const char *refname,

-              const unsigned char *old_sha1, unsigned int flags);
+              const struct object_id *old_oid, unsigned int flags);

 
 /*
  * Delete the specified references. If there are any problems, emit
 
 /*
  * Delete the specified references. If there are any problems, emit

diff --git a/refs/files-backend.c b/refs/files-backend.c
index 9db9237f1e37fa88ae28bfc0c2f55778895976fd..9c4766aa5748b78423324d5bdabac7278fe2c058 100644 (file)
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -1283,7 +1283,7 @@ static int files_copy_or_rename_ref(struct ref_store *ref_store,
        }
 
        if (!copy && refs_delete_ref(&refs->base, logmsg, oldrefname,
        }
 
        if (!copy && refs_delete_ref(&refs->base, logmsg, oldrefname,

-                           orig_oid.hash, REF_NODEREF)) {
+                           &orig_oid, REF_NODEREF)) {

                error("unable to delete old %s", oldrefname);
                goto rollback;
        }
                error("unable to delete old %s", oldrefname);
                goto rollback;
        }

diff --git a/t/helper/test-ref-store.c b/t/helper/test-ref-store.c
index 05d8c4d8af093ad42d855b17d243fe07b8893bfb..4624238641513b8d25b98961b36e1f777bf872a7 100644 (file)
--- a/t/helper/test-ref-store.c
+++ b/t/helper/test-ref-store.c
@@ -218,12 +218,12 @@ static int cmd_delete_ref(struct ref_store *refs, const char **argv)
        const char *refname = notnull(*argv++, "refname");
        const char *sha1_buf = notnull(*argv++, "old-sha1");
        unsigned int flags = arg_flags(*argv++, "flags");
        const char *refname = notnull(*argv++, "refname");
        const char *sha1_buf = notnull(*argv++, "old-sha1");
        unsigned int flags = arg_flags(*argv++, "flags");

-       unsigned char old_sha1[20];
+       struct object_id old_oid;

 
 

-       if (get_sha1_hex(sha1_buf, old_sha1))
+       if (get_oid_hex(sha1_buf, &old_oid))

                die("not sha-1");
 
                die("not sha-1");
 

-       return refs_delete_ref(refs, msg, refname, old_sha1, flags);
+       return refs_delete_ref(refs, msg, refname, &old_oid, flags);

 }
 
 static int cmd_update_ref(struct ref_store *refs, const char **argv)
 }
 
 static int cmd_update_ref(struct ref_store *refs, const char **argv)