kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

remote: convert match_push_refs to use struct refspec 

Convert 'match_push_refs()' to use struct refspec.

Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Brandon Williams 2018-05-16 15:57:57 -07:00 committed by Junio C Hamano
parent 0460f47277
commit 8ca69370c8
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
remote.c
View File

@ -1312,7 +1312,7 @@ int check_push_refs(struct ref *src, int nr_refspec, const char **refspec_names)
int match_push_refs(struct ref *src, struct ref **dst, int match_push_refs(struct ref *src, struct ref **dst,
int nr_refspec, const char **refspec, int flags) int nr_refspec, const char **refspec, int flags)
{ {
struct refspec_item *rs; struct refspec rs = REFSPEC_INIT_PUSH;
int send_all = flags & MATCH_REFS_ALL; int send_all = flags & MATCH_REFS_ALL;
int send_mirror = flags & MATCH_REFS_MIRROR; int send_mirror = flags & MATCH_REFS_MIRROR;
int send_prune = flags & MATCH_REFS_PRUNE; int send_prune = flags & MATCH_REFS_PRUNE;
@ -1325,8 +1325,8 @@ int match_push_refs(struct ref *src, struct ref **dst,
nr_refspec = 1; nr_refspec = 1;
refspec = default_refspec; refspec = default_refspec;
} }
rs = parse_push_refspec(nr_refspec, (const char **) refspec); refspec_appendn(&rs, refspec, nr_refspec);
errs = match_explicit_refs(src, *dst, &dst_tail, rs, nr_refspec); errs = match_explicit_refs(src, *dst, &dst_tail, rs.items, rs.nr);


/* pick the remainder */ /* pick the remainder */
for (ref = src; ref; ref = ref->next) { for (ref = src; ref; ref = ref->next) {
@ -1335,7 +1335,7 @@ int match_push_refs(struct ref *src, struct ref **dst,
const struct refspec_item *pat = NULL; const struct refspec_item *pat = NULL;
char *dst_name; char *dst_name;


dst_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_SRC, &pat); dst_name = get_ref_match(rs.items, rs.nr, ref, send_mirror, FROM_SRC, &pat);
if (!dst_name) if (!dst_name)
continue; continue;


@ -1384,7 +1384,7 @@ int match_push_refs(struct ref *src, struct ref **dst,
/* We're already sending something to this ref. */ /* We're already sending something to this ref. */
continue; continue;


src_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_DST, NULL); src_name = get_ref_match(rs.items, rs.nr, ref, send_mirror, FROM_DST, NULL);
if (src_name) { if (src_name) {
if (!src_ref_index.nr) if (!src_ref_index.nr)
prepare_ref_index(&src_ref_index, src); prepare_ref_index(&src_ref_index, src);
@ -1396,6 +1396,9 @@ int match_push_refs(struct ref *src, struct ref **dst,
} }
string_list_clear(&src_ref_index, 0); string_list_clear(&src_ref_index, 0);
} }

refspec_clear(&rs);

if (errs) if (errs)
return -1; return -1;
return 0; return 0;