builtin/remote: rewrite functions to take object_id arguments
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael Haggerty committed
May 25, 2015 at 18:38 UTC
53dc95b5cfa1155c3bf9cf909cfc5cb133add1ac
1 file changed
+8
-13
builtin/remote.c
+8
-13
@@ -554,20 +554,20 @@ struct rename_info {
554
};
555
556
static int read_remote_branches(const char *refname,
557
- const unsigned char *sha1, int flags, void *cb_data)
557
+ const struct object_id *oid, int flags, void *cb_data)
558
{
559
struct rename_info *rename = cb_data;
560
struct strbuf buf = STRBUF_INIT;
561
struct string_list_item *item;
562
int flag;
563
- unsigned char orig_sha1[20];
563
+ struct object_id orig_oid;
564
const char *symref;
565
566
strbuf_addf(&buf, "refs/remotes/%s/", rename->old);
567
if (starts_with(refname, buf.buf)) {
568
item = string_list_append(rename->remote_branches, xstrdup(refname));
569
symref = resolve_ref_unsafe(refname, RESOLVE_REF_READING,
570
- orig_sha1, &flag);
570
+ orig_oid.hash, &flag);
571
if (flag & REF_ISSYMREF)
572
item->util = xstrdup(symref);
573
else
@@ -620,8 +620,6 @@ static int mv(int argc, const char **argv)
620
struct string_list remote_branches = STRING_LIST_INIT_NODUP;
621
struct rename_info rename;
622
int i, refspec_updated = 0;
623
- struct each_ref_fn_sha1_adapter wrapped_read_remote_branches =
624
- {read_remote_branches, &rename};
623
624
if (argc != 3)
625
usage_with_options(builtin_remote_rename_usage, options);
@@ -699,13 +697,13 @@ static int mv(int argc, const char **argv)
697
* First remove symrefs, then rename the rest, finally create
698
* the new symrefs.
699
*/
702
- for_each_ref(each_ref_fn_adapter, &wrapped_read_remote_branches);
700
+ for_each_ref(read_remote_branches, &rename);
701
for (i = 0; i < remote_branches.nr; i++) {
702
struct string_list_item *item = remote_branches.items + i;
703
int flag = 0;
706
- unsigned char sha1[20];
704
+ struct object_id oid;
705
708
- read_ref_full(item->string, RESOLVE_REF_READING, sha1, &flag);
706
+ read_ref_full(item->string, RESOLVE_REF_READING, oid.hash, &flag);
707
if (!(flag & REF_ISSYMREF))
708
continue;
709
if (delete_ref(item->string, NULL, REF_NODEREF))
@@ -866,7 +864,7 @@ static void free_remote_ref_states(struct ref_states *states)
864
}
865
866
static int append_ref_to_tracked_list(const char *refname,
869
- const unsigned char *sha1, int flags, void *cb_data)
867
+ const struct object_id *oid, int flags, void *cb_data)
868
{
869
struct ref_states *states = cb_data;
870
struct refspec refspec;
@@ -909,10 +907,7 @@ static int get_remote_ref_states(const char *name,
907
if (query & GET_PUSH_REF_STATES)
908
get_push_ref_states(remote_refs, states);
909
} else {
912
- struct each_ref_fn_sha1_adapter wrapped_append_ref_to_tracked_list =
913
- {append_ref_to_tracked_list, states};
914
-
915
- for_each_ref(each_ref_fn_adapter, &wrapped_append_ref_to_tracked_list);
910
+ for_each_ref(append_ref_to_tracked_list, states);
911
string_list_sort(&states->tracked);
912
get_push_ref_states_noquery(states);
913
}