summaryrefslogtreecommitdiff
path: root/builtin/archive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-11-15 23:39:33 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-11-15 23:39:33 (GMT)
commitf0c7fd49c0b9454808486e8c56cd3d9c022d56f2 (patch)
tree6691eba265690671885be3ff7a0acc52a0d88b59 /builtin/archive.c
parentbc1bbe0c19a6ff39522b4fa3259f34150e308e1f (diff)
downloadgit-f0c7fd49c0b9454808486e8c56cd3d9c022d56f2.zip
git-f0c7fd49c0b9454808486e8c56cd3d9c022d56f2.tar.gz
git-f0c7fd49c0b9454808486e8c56cd3d9c022d56f2.tar.bz2
Revert "upload-archive: use start_command instead of fork"
This reverts commit c09cd77ea2fe3580b33918a99fe138d239ac2aaf, expecting a better version to be rerolled soon.
Diffstat (limited to 'builtin/archive.c')
-rw-r--r--builtin/archive.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/builtin/archive.c b/builtin/archive.c
index e405566..931956d 100644
--- a/builtin/archive.c
+++ b/builtin/archive.c
@@ -87,7 +87,6 @@ int cmd_archive(int argc, const char **argv, const char *prefix)
const char *exec = "git-upload-archive";
const char *output = NULL;
const char *remote = NULL;
- int is_remote = 0;
struct option local_opts[] = {
OPT_STRING('o', "output", &output, "file",
"write the archive to this file"),
@@ -95,9 +94,6 @@ int cmd_archive(int argc, const char **argv, const char *prefix)
"retrieve the archive from remote repository <repo>"),
OPT_STRING(0, "exec", &exec, "cmd",
"path to the remote git-upload-archive command"),
- { OPTION_BOOLEAN, 0, "remote-request", &is_remote, NULL,
- "indicate we are serving a remote request",
- PARSE_OPT_NOARG | PARSE_OPT_HIDDEN },
OPT_END()
};
@@ -112,5 +108,5 @@ int cmd_archive(int argc, const char **argv, const char *prefix)
setvbuf(stderr, NULL, _IOLBF, BUFSIZ);
- return write_archive(argc, argv, prefix, 1, output, is_remote);
+ return write_archive(argc, argv, prefix, 1, output, 0);
}