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

send-pack: store refspecs in a struct refspec

Browse Source 
Convert send-pack.c to store refspecs in a 'struct refspec' instead of
as an array of 'const char *'.

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

24
builtin/send-pack.c
View File

@ -126,8 +126,7 @@ static int send_pack_config(const char *k, const char *v, void *cb)
int cmd_send_pack(int argc, const char **argv, const char *prefix) int cmd_send_pack(int argc, const char **argv, const char *prefix)
{ {
int i, nr_refspecs = 0; struct refspec rs = REFSPEC_INIT_PUSH;
const char **refspecs = NULL;
const char *remote_name = NULL; const char *remote_name = NULL;
struct remote *remote = NULL; struct remote *remote = NULL;
const char *dest = NULL; const char *dest = NULL;
@ -189,8 +188,7 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
argc = parse_options(argc, argv, prefix, options, send_pack_usage, 0); argc = parse_options(argc, argv, prefix, options, send_pack_usage, 0);
if (argc > 0) { if (argc > 0) {
dest = argv[0]; dest = argv[0];
refspecs = (const char **)(argv + 1); refspec_appendn(&rs, argv + 1, argc - 1);
nr_refspecs = argc - 1;
} }
if (!dest) if (!dest)
@ -209,31 +207,23 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
args.push_options = push_options.nr ? &push_options : NULL; args.push_options = push_options.nr ? &push_options : NULL;
if (from_stdin) { if (from_stdin) {
struct argv_array all_refspecs = ARGV_ARRAY_INIT;
for (i = 0; i < nr_refspecs; i++)
argv_array_push(&all_refspecs, refspecs[i]);
if (args.stateless_rpc) { if (args.stateless_rpc) {
const char *buf; const char *buf;
while ((buf = packet_read_line(0, NULL))) while ((buf = packet_read_line(0, NULL)))
argv_array_push(&all_refspecs, buf); refspec_append(&rs, buf);
} else { } else {
struct strbuf line = STRBUF_INIT; struct strbuf line = STRBUF_INIT;
while (strbuf_getline(&line, stdin) != EOF) while (strbuf_getline(&line, stdin) != EOF)
argv_array_push(&all_refspecs, line.buf); refspec_append(&rs, line.buf);
strbuf_release(&line); strbuf_release(&line);
} }
refspecs = all_refspecs.argv;
nr_refspecs = all_refspecs.argc;
} }
/* /*
* --all and --mirror are incompatible; neither makes sense * --all and --mirror are incompatible; neither makes sense
* with any refspecs. * with any refspecs.
*/ */
if ((nr_refspecs > 0 && (send_all || args.send_mirror)) || if ((rs.nr > 0 && (send_all || args.send_mirror)) ||
(send_all && args.send_mirror)) (send_all && args.send_mirror))
usage_with_options(send_pack_usage, options); usage_with_options(send_pack_usage, options);
@ -275,7 +265,7 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
BUG("unknown protocol version"); BUG("unknown protocol version");
} }
transport_verify_remote_names(nr_refspecs, refspecs); transport_verify_remote_names(rs.raw_nr, rs.raw);
local_refs = get_local_heads(); local_refs = get_local_heads();
@ -287,7 +277,7 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
flags |= MATCH_REFS_MIRROR; flags |= MATCH_REFS_MIRROR;
/* match them up */ /* match them up */
if (match_push_refs(local_refs, &remote_refs, nr_refspecs, refspecs, flags)) if (match_push_refs(local_refs, &remote_refs, rs.raw_nr, rs.raw, flags))
return -1; return -1;
if (!is_empty_cas(&cas)) if (!is_empty_cas(&cas))