mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
upload-archive: use start_command instead of fork
The POSIX-function fork is not supported on Windows. Use our start_command API instead. As this is the last call-site that depends on the fork-stub in compat/mingw.h, remove that as well. Add an undocumented flag to git-archive that tells it that the action originated from a remote, so features can be disabled. Thanks to Jeff King for work on this part. Remove the NOT_MINGW-prereq for t5000, as git-archive --remote now works. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Helped-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
f0bd664977
commit
c09cd77ea2
|
@ -87,6 +87,7 @@ int cmd_archive(int argc, const char **argv, const char *prefix)
|
||||||
const char *exec = "git-upload-archive";
|
const char *exec = "git-upload-archive";
|
||||||
const char *output = NULL;
|
const char *output = NULL;
|
||||||
const char *remote = NULL;
|
const char *remote = NULL;
|
||||||
|
int is_remote = 0;
|
||||||
struct option local_opts[] = {
|
struct option local_opts[] = {
|
||||||
OPT_STRING('o', "output", &output, "file",
|
OPT_STRING('o', "output", &output, "file",
|
||||||
"write the archive to this file"),
|
"write the archive to this file"),
|
||||||
|
@ -94,6 +95,9 @@ int cmd_archive(int argc, const char **argv, const char *prefix)
|
||||||
"retrieve the archive from remote repository <repo>"),
|
"retrieve the archive from remote repository <repo>"),
|
||||||
OPT_STRING(0, "exec", &exec, "cmd",
|
OPT_STRING(0, "exec", &exec, "cmd",
|
||||||
"path to the remote git-upload-archive command"),
|
"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()
|
OPT_END()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -108,5 +112,5 @@ int cmd_archive(int argc, const char **argv, const char *prefix)
|
||||||
|
|
||||||
setvbuf(stderr, NULL, _IOLBF, BUFSIZ);
|
setvbuf(stderr, NULL, _IOLBF, BUFSIZ);
|
||||||
|
|
||||||
return write_archive(argc, argv, prefix, 1, output, 0);
|
return write_archive(argc, argv, prefix, 1, output, is_remote);
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
#include "archive.h"
|
#include "archive.h"
|
||||||
#include "pkt-line.h"
|
#include "pkt-line.h"
|
||||||
#include "sideband.h"
|
#include "sideband.h"
|
||||||
|
#include "run-command.h"
|
||||||
|
|
||||||
static const char upload_archive_usage[] =
|
static const char upload_archive_usage[] =
|
||||||
"git upload-archive <repo>";
|
"git upload-archive <repo>";
|
||||||
|
@ -18,28 +19,17 @@ static const char lostchild[] =
|
||||||
|
|
||||||
#define MAX_ARGS (64)
|
#define MAX_ARGS (64)
|
||||||
|
|
||||||
static int run_upload_archive(int argc, const char **argv, const char *prefix)
|
static void prepare_argv(const char **sent_argv, const char **argv)
|
||||||
{
|
{
|
||||||
const char *sent_argv[MAX_ARGS];
|
|
||||||
const char *arg_cmd = "argument ";
|
const char *arg_cmd = "argument ";
|
||||||
char *p, buf[4096];
|
char *p, buf[4096];
|
||||||
int sent_argc;
|
int sent_argc;
|
||||||
int len;
|
int len;
|
||||||
|
|
||||||
if (argc != 2)
|
|
||||||
usage(upload_archive_usage);
|
|
||||||
|
|
||||||
if (strlen(argv[1]) + 1 > sizeof(buf))
|
|
||||||
die("insanely long repository name");
|
|
||||||
|
|
||||||
strcpy(buf, argv[1]); /* enter-repo smudges its argument */
|
|
||||||
|
|
||||||
if (!enter_repo(buf, 0))
|
|
||||||
die("'%s' does not appear to be a git repository", buf);
|
|
||||||
|
|
||||||
/* put received options in sent_argv[] */
|
/* put received options in sent_argv[] */
|
||||||
sent_argc = 1;
|
sent_argc = 2;
|
||||||
sent_argv[0] = "git-upload-archive";
|
sent_argv[0] = "archive";
|
||||||
|
sent_argv[1] = "--remote-request";
|
||||||
for (p = buf;;) {
|
for (p = buf;;) {
|
||||||
/* This will die if not enough free space in buf */
|
/* This will die if not enough free space in buf */
|
||||||
len = packet_read_line(0, p, (buf + sizeof buf) - p);
|
len = packet_read_line(0, p, (buf + sizeof buf) - p);
|
||||||
|
@ -62,9 +52,6 @@ static int run_upload_archive(int argc, const char **argv, const char *prefix)
|
||||||
*p++ = 0;
|
*p++ = 0;
|
||||||
}
|
}
|
||||||
sent_argv[sent_argc] = NULL;
|
sent_argv[sent_argc] = NULL;
|
||||||
|
|
||||||
/* parse all options sent by the client */
|
|
||||||
return write_archive(sent_argc, sent_argv, prefix, 0, NULL, 1);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
__attribute__((format (printf, 1, 2)))
|
__attribute__((format (printf, 1, 2)))
|
||||||
|
@ -96,38 +83,25 @@ static ssize_t process_input(int child_fd, int band)
|
||||||
|
|
||||||
int cmd_upload_archive(int argc, const char **argv, const char *prefix)
|
int cmd_upload_archive(int argc, const char **argv, const char *prefix)
|
||||||
{
|
{
|
||||||
pid_t writer;
|
const char *sent_argv[MAX_ARGS];
|
||||||
int fd1[2], fd2[2];
|
struct child_process cld = { sent_argv };
|
||||||
/*
|
cld.out = cld.err = -1;
|
||||||
* Set up sideband subprocess.
|
cld.git_cmd = 1;
|
||||||
*
|
|
||||||
* We (parent) monitor and read from child, sending its fd#1 and fd#2
|
if (argc != 2)
|
||||||
* multiplexed out to our fd#1. If the child dies, we tell the other
|
usage(upload_archive_usage);
|
||||||
* end over channel #3.
|
|
||||||
*/
|
if (!enter_repo(argv[1], 0))
|
||||||
if (pipe(fd1) < 0 || pipe(fd2) < 0) {
|
die("'%s' does not appear to be a git repository", argv[1]);
|
||||||
int err = errno;
|
|
||||||
packet_write(1, "NACK pipe failed on the remote side\n");
|
prepare_argv(sent_argv, argv);
|
||||||
die("upload-archive: %s", strerror(err));
|
if (start_command(&cld)) {
|
||||||
}
|
|
||||||
writer = fork();
|
|
||||||
if (writer < 0) {
|
|
||||||
int err = errno;
|
int err = errno;
|
||||||
packet_write(1, "NACK fork failed on the remote side\n");
|
packet_write(1, "NACK fork failed on the remote side\n");
|
||||||
die("upload-archive: %s", strerror(err));
|
die("upload-archive: %s", strerror(err));
|
||||||
}
|
}
|
||||||
if (!writer) {
|
|
||||||
/* child - connect fd#1 and fd#2 to the pipe */
|
|
||||||
dup2(fd1[1], 1);
|
|
||||||
dup2(fd2[1], 2);
|
|
||||||
close(fd1[1]); close(fd2[1]);
|
|
||||||
close(fd1[0]); close(fd2[0]); /* we do not read from pipe */
|
|
||||||
|
|
||||||
exit(run_upload_archive(argc, argv, prefix));
|
|
||||||
}
|
|
||||||
|
|
||||||
/* parent - read from child, multiplex and send out to fd#1 */
|
/* parent - read from child, multiplex and send out to fd#1 */
|
||||||
close(fd1[1]); close(fd2[1]); /* we do not write to pipe */
|
|
||||||
packet_write(1, "ACK\n");
|
packet_write(1, "ACK\n");
|
||||||
packet_flush(1);
|
packet_flush(1);
|
||||||
|
|
||||||
|
@ -135,9 +109,9 @@ int cmd_upload_archive(int argc, const char **argv, const char *prefix)
|
||||||
struct pollfd pfd[2];
|
struct pollfd pfd[2];
|
||||||
int status;
|
int status;
|
||||||
|
|
||||||
pfd[0].fd = fd1[0];
|
pfd[0].fd = cld.out;
|
||||||
pfd[0].events = POLLIN;
|
pfd[0].events = POLLIN;
|
||||||
pfd[1].fd = fd2[0];
|
pfd[1].fd = cld.err;
|
||||||
pfd[1].events = POLLIN;
|
pfd[1].events = POLLIN;
|
||||||
if (poll(pfd, 2, -1) < 0) {
|
if (poll(pfd, 2, -1) < 0) {
|
||||||
if (errno != EINTR) {
|
if (errno != EINTR) {
|
||||||
|
@ -156,7 +130,7 @@ int cmd_upload_archive(int argc, const char **argv, const char *prefix)
|
||||||
if (process_input(pfd[0].fd, 1))
|
if (process_input(pfd[0].fd, 1))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (waitpid(writer, &status, 0) < 0)
|
if (waitpid(cld.pid, &status, 0) < 0)
|
||||||
error_clnt("%s", lostchild);
|
error_clnt("%s", lostchild);
|
||||||
else if (!WIFEXITED(status) || WEXITSTATUS(status) > 0)
|
else if (!WIFEXITED(status) || WEXITSTATUS(status) > 0)
|
||||||
error_clnt("%s", deadchild);
|
error_clnt("%s", deadchild);
|
||||||
|
|
|
@ -85,8 +85,6 @@ static inline int symlink(const char *oldpath, const char *newpath)
|
||||||
{ errno = ENOSYS; return -1; }
|
{ errno = ENOSYS; return -1; }
|
||||||
static inline int fchmod(int fildes, mode_t mode)
|
static inline int fchmod(int fildes, mode_t mode)
|
||||||
{ errno = ENOSYS; return -1; }
|
{ errno = ENOSYS; return -1; }
|
||||||
static inline pid_t fork(void)
|
|
||||||
{ errno = ENOSYS; return -1; }
|
|
||||||
static inline unsigned int alarm(unsigned int seconds)
|
static inline unsigned int alarm(unsigned int seconds)
|
||||||
{ return 0; }
|
{ return 0; }
|
||||||
static inline int fsync(int fd)
|
static inline int fsync(int fd)
|
||||||
|
|
|
@ -96,7 +96,7 @@ test_expect_success 'git archive with --output' \
|
||||||
'git archive --output=b4.tar HEAD &&
|
'git archive --output=b4.tar HEAD &&
|
||||||
test_cmp b.tar b4.tar'
|
test_cmp b.tar b4.tar'
|
||||||
|
|
||||||
test_expect_success NOT_MINGW 'git archive --remote' \
|
test_expect_success 'git archive --remote' \
|
||||||
'git archive --remote=. HEAD >b5.tar &&
|
'git archive --remote=. HEAD >b5.tar &&
|
||||||
test_cmp b.tar b5.tar'
|
test_cmp b.tar b5.tar'
|
||||||
|
|
||||||
|
@ -266,7 +266,7 @@ test_expect_success 'archive --list mentions user filter' '
|
||||||
grep "^bar\$" output
|
grep "^bar\$" output
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success NOT_MINGW 'archive --list shows only enabled remote filters' '
|
test_expect_success 'archive --list shows only enabled remote filters' '
|
||||||
git archive --list --remote=. >output &&
|
git archive --list --remote=. >output &&
|
||||||
! grep "^tar\.foo\$" output &&
|
! grep "^tar\.foo\$" output &&
|
||||||
grep "^bar\$" output
|
grep "^bar\$" output
|
||||||
|
@ -298,7 +298,7 @@ test_expect_success 'extension matching requires dot' '
|
||||||
test_cmp b.tar config-implicittar.foo
|
test_cmp b.tar config-implicittar.foo
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success NOT_MINGW 'only enabled filters are available remotely' '
|
test_expect_success 'only enabled filters are available remotely' '
|
||||||
test_must_fail git archive --remote=. --format=tar.foo HEAD \
|
test_must_fail git archive --remote=. --format=tar.foo HEAD \
|
||||||
>remote.tar.foo &&
|
>remote.tar.foo &&
|
||||||
git archive --remote=. --format=bar >remote.bar HEAD &&
|
git archive --remote=. --format=bar >remote.bar HEAD &&
|
||||||
|
@ -341,12 +341,12 @@ test_expect_success GZIP,GUNZIP 'extract tgz file' '
|
||||||
test_cmp b.tar j.tar
|
test_cmp b.tar j.tar
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success GZIP,NOT_MINGW 'remote tar.gz is allowed by default' '
|
test_expect_success GZIP 'remote tar.gz is allowed by default' '
|
||||||
git archive --remote=. --format=tar.gz HEAD >remote.tar.gz &&
|
git archive --remote=. --format=tar.gz HEAD >remote.tar.gz &&
|
||||||
test_cmp j.tgz remote.tar.gz
|
test_cmp j.tgz remote.tar.gz
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success GZIP,NOT_MINGW 'remote tar.gz can be disabled' '
|
test_expect_success GZIP 'remote tar.gz can be disabled' '
|
||||||
git config tar.tar.gz.remote false &&
|
git config tar.tar.gz.remote false &&
|
||||||
test_must_fail git archive --remote=. --format=tar.gz HEAD \
|
test_must_fail git archive --remote=. --format=tar.gz HEAD \
|
||||||
>remote.tar.gz
|
>remote.tar.gz
|
||||||
|
|
Loading…
Reference in a new issue