undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

transport: convert transport_push to take a struct refspec

Browse Source 
Convert 'transport_push()' to take a 'struct refspec' as a
parameter instead of an array of strings which represent
refspecs.

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:58:17 -07:00 committed by Junio C Hamano
parent aa40289ce9
commit 306f22dbc8
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/push.c
View File

@ -355,8 +355,7 @@ static int push_with_options(struct transport *transport, struct refspec *rs,
if (verbosity > 0) if (verbosity > 0)
fprintf(stderr, _("Pushing to %s\n"), transport->url); fprintf(stderr, _("Pushing to %s\n"), transport->url);
err = transport_push(transport, rs->raw_nr, rs->raw, flags, err = transport_push(transport, rs, flags, &reject_reasons);
&reject_reasons);
if (err != 0) { if (err != 0) {
fprintf(stderr, "%s", push_get_color(PUSH_COLOR_ERROR)); fprintf(stderr, "%s", push_get_color(PUSH_COLOR_ERROR));
error(_("failed to push some refs to '%s'"), transport->url); error(_("failed to push some refs to '%s'"), transport->url);

17
transport.c
View File

@ -1093,11 +1093,11 @@ static int run_pre_push_hook(struct transport *transport,
} }
int transport_push(struct transport *transport, int transport_push(struct transport *transport,
int refspec_nr, const char **refspec, int flags, struct refspec *rs, int flags,
unsigned int *reject_reasons) unsigned int *reject_reasons)
{ {
*reject_reasons = 0; *reject_reasons = 0;
transport_verify_remote_names(refspec_nr, refspec); transport_verify_remote_names(rs->raw_nr, rs->raw);
if (transport_color_config() < 0) if (transport_color_config() < 0)
return -1; return -1;
@ -1111,16 +1111,14 @@ 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 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, rs->raw_nr, rs->raw) < 0)
return -1; return -1;
refspec_appendn(&tmp_rs, refspec, refspec_nr); for (i = 0; i < rs->nr; i++) {
for (i = 0; i < tmp_rs.nr; i++) { const struct refspec_item *item = &rs->items[i];
const struct refspec_item *item = &tmp_rs.items[i];
const char *prefix = NULL; const char *prefix = NULL;
if (item->dst) if (item->dst)
@ -1143,7 +1141,6 @@ int transport_push(struct transport *transport,
&ref_prefixes); &ref_prefixes);
argv_array_clear(&ref_prefixes); argv_array_clear(&ref_prefixes);
refspec_clear(&tmp_rs);
if (flags & TRANSPORT_PUSH_ALL) if (flags & TRANSPORT_PUSH_ALL)
match_flags |= MATCH_REFS_ALL; match_flags |= MATCH_REFS_ALL;
@ -1155,7 +1152,7 @@ int transport_push(struct transport *transport,
match_flags |= MATCH_REFS_FOLLOW_TAGS; match_flags |= MATCH_REFS_FOLLOW_TAGS;
if (match_push_refs(local_refs, &remote_refs, if (match_push_refs(local_refs, &remote_refs,
refspec_nr, refspec, match_flags)) { rs->raw_nr, rs->raw, match_flags)) {
return -1; return -1;
} }
@ -1186,7 +1183,7 @@ int transport_push(struct transport *transport,
if (!push_unpushed_submodules(&commits, if (!push_unpushed_submodules(&commits,
transport->remote, transport->remote,
refspec, refspec_nr, rs->raw, rs->raw_nr,
transport->push_options, transport->push_options,
pretend)) { pretend)) {
oid_array_clear(&commits); oid_array_clear(&commits);

2
transport.h
View File

@ -197,7 +197,7 @@ void transport_set_verbosity(struct transport *transport, int verbosity,
#define REJECT_NEEDS_FORCE 0x10 #define REJECT_NEEDS_FORCE 0x10
int transport_push(struct transport *connection, int transport_push(struct transport *connection,
int refspec_nr, const char **refspec, int flags, struct refspec *rs, int flags,
unsigned int * reject_reasons); unsigned int * reject_reasons);
/* /*