Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks'

diff --git a/builtin/remote.c b/builtin/remote.c
index 27a611bfade2bc84d71bca1f7ff3cca7e74f95e7..f4a6ec9f138bcfe3b2519412fa70c289a0024fb5 100644 (file)
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -509,11 +509,10 @@ struct branches_for_remote {
 };
 
 static int add_branch_for_removal(const char *refname,
-       const unsigned char *sha1, int flags, void *cb_data)
+       const struct object_id *oid, int flags, void *cb_data)
 {
        struct branches_for_remote *branches = cb_data;
        struct refspec refspec;
-       struct string_list_item *item;
        struct known_remote *kr;
 
        memset(&refspec, 0, sizeof(refspec));
@@ -543,9 +542,7 @@ static int add_branch_for_removal(const char *refname,
        if (flags & REF_ISSYMREF)
                return unlink(git_path("%s", refname));
 
-       item = string_list_append(branches->branches, refname);
-       item->util = xmalloc(20);
-       hashcpy(item->util, sha1);
+       string_list_append(branches->branches, refname);
 
        return 0;
 }
@@ -557,20 +554,20 @@ struct rename_info {
 };
 
 static int read_remote_branches(const char *refname,
-       const unsigned char *sha1, int flags, void *cb_data)
+       const struct object_id *oid, int flags, void *cb_data)
 {
        struct rename_info *rename = cb_data;
        struct strbuf buf = STRBUF_INIT;
        struct string_list_item *item;
        int flag;
-       unsigned char orig_sha1[20];
+       struct object_id orig_oid;
        const char *symref;
 
        strbuf_addf(&buf, "refs/remotes/%s/", rename->old);
        if (starts_with(refname, buf.buf)) {
                item = string_list_append(rename->remote_branches, xstrdup(refname));
                symref = resolve_ref_unsafe(refname, RESOLVE_REF_READING,
-                                           orig_sha1, &flag);
+                                           orig_oid.hash, &flag);
                if (flag & REF_ISSYMREF)
                        item->util = xstrdup(symref);
                else
@@ -623,8 +620,6 @@ static int mv(int argc, const char **argv)
        struct string_list remote_branches = STRING_LIST_INIT_NODUP;
        struct rename_info rename;
        int i, refspec_updated = 0;
-       struct each_ref_fn_sha1_adapter wrapped_read_remote_branches =
-               {read_remote_branches, &rename};
 
        if (argc != 3)
                usage_with_options(builtin_remote_rename_usage, options);
@@ -702,13 +697,13 @@ static int mv(int argc, const char **argv)
         * First remove symrefs, then rename the rest, finally create
         * the new symrefs.
         */
-       for_each_ref(each_ref_fn_adapter, &wrapped_read_remote_branches);
+       for_each_ref(read_remote_branches, &rename);
        for (i = 0; i < remote_branches.nr; i++) {
                struct string_list_item *item = remote_branches.items + i;
                int flag = 0;
-               unsigned char sha1[20];
+               struct object_id oid;
 
-               read_ref_full(item->string, RESOLVE_REF_READING, sha1, &flag);
+               read_ref_full(item->string, RESOLVE_REF_READING, oid.hash, &flag);
                if (!(flag & REF_ISSYMREF))
                        continue;
                if (delete_ref(item->string, NULL, REF_NODEREF))
@@ -783,8 +778,6 @@ static int rm(int argc, const char **argv)
        struct string_list skipped = STRING_LIST_INIT_DUP;
        struct branches_for_remote cb_data;
        int i, result;
-       struct each_ref_fn_sha1_adapter wrapped_add_branch_for_removal =
-               {add_branch_for_removal, &cb_data};
 
        memset(&cb_data, 0, sizeof(cb_data));
        cb_data.branches = &branches;
@@ -825,12 +818,12 @@ static int rm(int argc, const char **argv)
         * refs, which are invalidated when deleting a branch.
         */
        cb_data.remote = remote;
-       result = for_each_ref(each_ref_fn_adapter, &wrapped_add_branch_for_removal);
+       result = for_each_ref(add_branch_for_removal, &cb_data);
        strbuf_release(&buf);
 
        if (!result)
                result = remove_branches(&branches);
-       string_list_clear(&branches, 1);
+       string_list_clear(&branches, 0);
 
        if (skipped.nr) {
                fprintf_ln(stderr,
@@ -871,7 +864,7 @@ static void free_remote_ref_states(struct ref_states *states)
 }
 
 static int append_ref_to_tracked_list(const char *refname,
-       const unsigned char *sha1, int flags, void *cb_data)
+       const struct object_id *oid, int flags, void *cb_data)
 {
        struct ref_states *states = cb_data;
        struct refspec refspec;
@@ -914,10 +907,7 @@ static int get_remote_ref_states(const char *name,
                if (query & GET_PUSH_REF_STATES)
                        get_push_ref_states(remote_refs, states);
        } else {
-               struct each_ref_fn_sha1_adapter wrapped_append_ref_to_tracked_list =
-                       {append_ref_to_tracked_list, states};
-
-               for_each_ref(each_ref_fn_adapter, &wrapped_append_ref_to_tracked_list);
+               for_each_ref(append_ref_to_tracked_list, states);
                string_list_sort(&states->tracked);
                get_push_ref_states_noquery(states);
        }