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

archive: allow --exec and --remote without equal sign

Browse Source 
Allow "--remote repo" and "--exec cmd" in addition to "--remote=repo" and
"--exec=cmd" to make their usage consistent with parameters handled by
parse_options().

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Rene Scharfe 2008-07-25 12:41:25 +02:00 committed by Junio C Hamano
parent f15f736d38
commit 819b2b5824
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
builtin-archive.c
View File

@ -15,7 +15,7 @@ static int run_remote_archiver(const char *remote, int argc,
int fd[2], i, len, rv; int fd[2], i, len, rv;
struct child_process *conn; struct child_process *conn;
const char *exec = "git-upload-archive"; const char *exec = "git-upload-archive";
int exec_at = 0; int exec_at = 0, exec_value_at = 0;
for (i = 1; i < argc; i++) { for (i = 1; i < argc; i++) {
const char *arg = argv[i]; const char *arg = argv[i];
@ -24,7 +24,14 @@ static int run_remote_archiver(const char *remote, int argc,
die("multiple --exec specified"); die("multiple --exec specified");
exec = arg + 7; exec = arg + 7;
exec_at = i; exec_at = i;
break; } else if (!strcmp(arg, "--exec")) {
if (exec_at)
die("multiple --exec specified");
if (i + 1 >= argc)
die("option --exec requires a value");
exec = argv[i + 1];
exec_at = i;
exec_value_at = ++i;
} }
} }
@ -32,7 +39,7 @@ static int run_remote_archiver(const char *remote, int argc,
conn = git_connect(fd, url, exec, 0); conn = git_connect(fd, url, exec, 0);
for (i = 1; i < argc; i++) { for (i = 1; i < argc; i++) {
if (i == exec_at) if (i == exec_at || i == exec_value_at)
continue; continue;
packet_write(fd[1], "argument %s\n", argv[i]); packet_write(fd[1], "argument %s\n", argv[i]);
} }
@ -78,6 +85,13 @@ static const char *extract_remote_arg(int *ac, const char **av)
die("Multiple --remote specified"); die("Multiple --remote specified");
remote = arg + 9; remote = arg + 9;
continue; continue;
} else if (!strcmp(arg, "--remote")) {
if (remote)
die("Multiple --remote specified");
if (++ix >= cnt)
die("option --remote requires a value");
remote = av[ix];
continue;
} }
if (arg[0] != '-') if (arg[0] != '-')
no_more_options = 1; no_more_options = 1;