development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-28 03:59:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

builtin/remote: rewrite functions to take object_id arguments

Browse source 
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>
This commit is contained in:
Michael Haggerty 2015-05-25 18:38:43 +00:00 committed by Junio C Hamano
parent e26cdf91c1
commit 53dc95b5cf
1 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
builtin/remote.c
View file

@ -554,20 +554,20 @@ struct rename_info {
}; };
static int read_remote_branches(const char *refname, 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 rename_info *rename = cb_data;
struct strbuf buf = STRBUF_INIT; struct strbuf buf = STRBUF_INIT;
struct string_list_item *item; struct string_list_item *item;
int flag; int flag;
unsigned char orig_sha1[20]; struct object_id orig_oid;
const char *symref; const char *symref;
strbuf_addf(&buf, "refs/remotes/%s/", rename->old); strbuf_addf(&buf, "refs/remotes/%s/", rename->old);
if (starts_with(refname, buf.buf)) { if (starts_with(refname, buf.buf)) {
item = string_list_append(rename->remote_branches, xstrdup(refname)); item = string_list_append(rename->remote_branches, xstrdup(refname));
symref = resolve_ref_unsafe(refname, RESOLVE_REF_READING, symref = resolve_ref_unsafe(refname, RESOLVE_REF_READING,
orig_sha1, &flag); orig_oid.hash, &flag);
if (flag & REF_ISSYMREF) if (flag & REF_ISSYMREF)
item->util = xstrdup(symref); item->util = xstrdup(symref);
else else
@ -620,8 +620,6 @@ static int mv(int argc, const char **argv)
struct string_list remote_branches = STRING_LIST_INIT_NODUP; struct string_list remote_branches = STRING_LIST_INIT_NODUP;
struct rename_info rename; struct rename_info rename;
int i, refspec_updated = 0; int i, refspec_updated = 0;
struct each_ref_fn_sha1_adapter wrapped_read_remote_branches =
{read_remote_branches, &rename};
if (argc != 3) if (argc != 3)
usage_with_options(builtin_remote_rename_usage, options); usage_with_options(builtin_remote_rename_usage, options);
@ -699,13 +697,13 @@ static int mv(int argc, const char **argv)
* First remove symrefs, then rename the rest, finally create * First remove symrefs, then rename the rest, finally create
* the new symrefs. * 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++) { for (i = 0; i < remote_branches.nr; i++) {
struct string_list_item *item = remote_branches.items + i; struct string_list_item *item = remote_branches.items + i;
int flag = 0; 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)) if (!(flag & REF_ISSYMREF))
continue; continue;
if (delete_ref(item->string, NULL, REF_NODEREF)) if (delete_ref(item->string, NULL, REF_NODEREF))
@ -866,7 +864,7 @@ static void free_remote_ref_states(struct ref_states *states)
} }
static int append_ref_to_tracked_list(const char *refname, 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 ref_states *states = cb_data;
struct refspec refspec; struct refspec refspec;
@ -909,10 +907,7 @@ static int get_remote_ref_states(const char *name,
if (query & GET_PUSH_REF_STATES) if (query & GET_PUSH_REF_STATES)
get_push_ref_states(remote_refs, states); get_push_ref_states(remote_refs, states);
} else { } else {
struct each_ref_fn_sha1_adapter wrapped_append_ref_to_tracked_list = for_each_ref(append_ref_to_tracked_list, states);
{append_ref_to_tracked_list, states};
for_each_ref(each_ref_fn_adapter, &wrapped_append_ref_to_tracked_list);
string_list_sort(&states->tracked); string_list_sort(&states->tracked);
get_push_ref_states_noquery(states); get_push_ref_states_noquery(states);
} }