transport: convert transport_push to use struct refspec
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>
Brandon Williams committed
May 16, 2018 at 15:57 UTC
e03c4e084d89f31dd4569b085d88b60758a54cd1
1 file changed
+9
-8
transport.c
+9
-8
@@ -1111,21 +1111,22 @@ int transport_push(struct transport *transport,
1111
int porcelain = flags & TRANSPORT_PUSH_PORCELAIN;
1112
int pretend = flags & TRANSPORT_PUSH_DRY_RUN;
1113
int push_ret, ret, err;
1114
- struct refspec_item *tmp_rs;
1114
+ struct refspec tmp_rs = REFSPEC_INIT_PUSH;
1115
struct argv_array ref_prefixes = ARGV_ARRAY_INIT;
1116
int i;
1117
1118
if (check_push_refs(local_refs, refspec_nr, refspec) < 0)
1119
return -1;
1120
1121
- tmp_rs = parse_push_refspec(refspec_nr, refspec);
1122
- for (i = 0; i < refspec_nr; i++) {
1121
+ refspec_appendn(&tmp_rs, refspec, refspec_nr);
1122
+ for (i = 0; i < tmp_rs.nr; i++) {
1123
+ const struct refspec_item *item = &tmp_rs.items[i];
1124
const char *prefix = NULL;
1125
1125
- if (tmp_rs[i].dst)
1126
- prefix = tmp_rs[i].dst;
1127
- else if (tmp_rs[i].src && !tmp_rs[i].exact_sha1)
1128
- prefix = tmp_rs[i].src;
1126
+ if (item->dst)
1127
+ prefix = item->dst;
1128
+ else if (item->src && !item->exact_sha1)
1129
+ prefix = item->src;
1130
1131
if (prefix) {
1132
const char *glob = strchr(prefix, '*');
@@ -1142,7 +1143,7 @@ int transport_push(struct transport *transport,
1143
&ref_prefixes);
1144
1145
argv_array_clear(&ref_prefixes);
1145
- free_refspec(refspec_nr, tmp_rs);
1146
+ refspec_clear(&tmp_rs);
1147
1148
if (flags & TRANSPORT_PUSH_ALL)
1149
match_flags |= MATCH_REFS_ALL;