summaryrefslogtreecommitdiff
path: root/builtin-archive.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-09-09 23:48:03 -0700
committerJunio C Hamano <junkio@cox.net>2006-09-09 23:57:46 -0700
commit37f944363d5b5fb5bcbf2d184865534739713c01 (patch)
treeb3f97e06445c0220b0149795035734fa40d25bfa /builtin-archive.c
parent854c4168e77a692dc198311f04bf31939355f2a3 (diff)
downloadgit-37f944363d5b5fb5bcbf2d184865534739713c01.tar.gz
archive: allow remote to have more formats than we understand.
This fixes git-archive --remote not to parse archiver arguments; otherwise if the remote end implements formats other than the one known locally we will not be able to access that format. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-archive.c')
-rw-r--r--builtin-archive.c79
1 files changed, 47 insertions, 32 deletions
diff --git a/builtin-archive.c b/builtin-archive.c
index b944737550..c70488c537 100644
--- a/builtin-archive.c
+++ b/builtin-archive.c
@@ -26,7 +26,7 @@ struct archiver archivers[] = {
},
};
-static int run_remote_archiver(struct archiver *ar, int argc,
+static int run_remote_archiver(const char *remote, int argc,
const char **argv)
{
char *url, buf[1024];
@@ -35,16 +35,13 @@ static int run_remote_archiver(struct archiver *ar, int argc,
sprintf(buf, "git-upload-archive");
- url = xstrdup(ar->remote);
+ url = xstrdup(remote);
pid = git_connect(fd, url, buf);
if (pid < 0)
return pid;
- for (i = 1; i < argc; i++) {
- if (!strncmp(argv[i], "--remote=", 9))
- continue;
+ for (i = 1; i < argc; i++)
packet_write(fd[1], "argument %s\n", argv[i]);
- }
packet_flush(fd[1]);
len = packet_read_line(fd[0], buf, sizeof(buf));
@@ -150,17 +147,16 @@ int parse_archive_args(int argc, const char **argv, struct archiver *ar)
const char *extra_argv[MAX_EXTRA_ARGS];
int extra_argc = 0;
const char *format = NULL; /* might want to default to "tar" */
- const char *remote = NULL;
const char *base = "";
- int list = 0;
int i;
for (i = 1; i < argc; i++) {
const char *arg = argv[i];
if (!strcmp(arg, "--list") || !strcmp(arg, "-l")) {
- list = 1;
- continue;
+ for (i = 0; i < ARRAY_SIZE(archivers); i++)
+ printf("%s\n", archivers[i].name);
+ exit(0);
}
if (!strncmp(arg, "--format=", 9)) {
format = arg + 9;
@@ -170,10 +166,6 @@ int parse_archive_args(int argc, const char **argv, struct archiver *ar)
base = arg + 9;
continue;
}
- if (!strncmp(arg, "--remote=", 9)) {
- remote = arg + 9;
- continue;
- }
if (!strcmp(arg, "--")) {
i++;
break;
@@ -187,44 +179,67 @@ int parse_archive_args(int argc, const char **argv, struct archiver *ar)
break;
}
- if (list) {
- if (!remote) {
- for (i = 0; i < ARRAY_SIZE(archivers); i++)
- printf("%s\n", archivers[i].name);
- exit(0);
- }
- die("--list and --remote are mutually exclusive");
- }
-
- if (argc - i < 1)
+ /* We need at least one parameter -- tree-ish */
+ if (argc - 1 < i)
usage(archive_usage);
if (!format)
die("You must specify an archive format");
if (init_archiver(format, ar) < 0)
die("Unknown archive format '%s'", format);
- if (extra_argc && !remote) {
- if (!ar->parse_extra) {
+ if (extra_argc) {
+ if (!ar->parse_extra)
die("%s", default_parse_extra(ar, extra_argv));
- }
ar->args.extra = ar->parse_extra(extra_argc, extra_argv);
}
- ar->remote = remote;
ar->args.base = base;
return i;
}
+static const char *remote_request(int *ac, const char **av)
+{
+ int ix, iy, cnt = *ac;
+ int no_more_options = 0;
+ const char *remote = NULL;
+
+ for (ix = iy = 1; ix < cnt; ix++) {
+ const char *arg = av[ix];
+ if (!strcmp(arg, "--"))
+ no_more_options = 1;
+ if (!no_more_options) {
+ if (!strncmp(arg, "--remote=", 9)) {
+ if (remote)
+ die("Multiple --remote specified");
+ remote = arg + 9;
+ continue;
+ }
+ if (arg[0] != '-')
+ no_more_options = 1;
+ }
+ if (ix != iy)
+ av[iy] = arg;
+ iy++;
+ }
+ if (remote) {
+ av[--cnt] = NULL;
+ *ac = cnt;
+ }
+ return remote;
+}
+
int cmd_archive(int argc, const char **argv, const char *prefix)
{
struct archiver ar;
int tree_idx;
+ const char *remote = NULL;
- tree_idx = parse_archive_args(argc, argv, &ar);
-
- if (ar.remote)
- return run_remote_archiver(&ar, argc, argv);
+ remote = remote_request(&argc, argv);
+ if (remote)
+ return run_remote_archiver(remote, argc, argv);
+ memset(&ar, 0, sizeof(ar));
+ tree_idx = parse_archive_args(argc, argv, &ar);
if (prefix == NULL)
prefix = setup_git_directory();