mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

transport: convert transport_push to use struct refspec

Browse Source 
Convert the logic in 'transport_push()' which calculates a list of
ref-prefixes to use 'struct refspec'.

Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Brandon Williams
2018-05-16 15:57:55 -07:00
committed by Junio C Hamano
parent 895d391258
commit e03c4e084d
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
transport.c
View File

@ -1111,21 +1111,22 @@ int transport_push(struct transport *transport,
int porcelain = flags & TRANSPORT_PUSH_PORCELAIN; int porcelain = flags & TRANSPORT_PUSH_PORCELAIN;
int pretend = flags & TRANSPORT_PUSH_DRY_RUN; int pretend = flags & TRANSPORT_PUSH_DRY_RUN;
int push_ret, ret, err; int push_ret, ret, err;
struct refspec_item *tmp_rs; struct refspec tmp_rs = REFSPEC_INIT_PUSH;
struct argv_array ref_prefixes = ARGV_ARRAY_INIT; struct argv_array ref_prefixes = ARGV_ARRAY_INIT;
int i; int i;
if (check_push_refs(local_refs, refspec_nr, refspec) < 0) if (check_push_refs(local_refs, refspec_nr, refspec) < 0)
return -1; return -1;
tmp_rs = parse_push_refspec(refspec_nr, refspec); refspec_appendn(&tmp_rs, refspec, refspec_nr);
for (i = 0; i < refspec_nr; i++) { for (i = 0; i < tmp_rs.nr; i++) {
const struct refspec_item *item = &tmp_rs.items[i];
const char *prefix = NULL; const char *prefix = NULL;
if (tmp_rs[i].dst) if (item->dst)
prefix = tmp_rs[i].dst; prefix = item->dst;
else if (tmp_rs[i].src && !tmp_rs[i].exact_sha1) else if (item->src && !item->exact_sha1)
prefix = tmp_rs[i].src; prefix = item->src;
if (prefix) { if (prefix) {
const char *glob = strchr(prefix, '*'); const char *glob = strchr(prefix, '*');
@ -1142,7 +1143,7 @@ int transport_push(struct transport *transport,
&ref_prefixes); &ref_prefixes);
argv_array_clear(&ref_prefixes); argv_array_clear(&ref_prefixes);
free_refspec(refspec_nr, tmp_rs); refspec_clear(&tmp_rs);
if (flags & TRANSPORT_PUSH_ALL) if (flags & TRANSPORT_PUSH_ALL)
match_flags |= MATCH_REFS_ALL; match_flags |= MATCH_REFS_ALL;