diff options
author | Vincent Ambo <mail@tazj.in> | 2021-09-21T10·03+0300 |
---|---|---|
committer | Vincent Ambo <mail@tazj.in> | 2021-09-21T11·29+0300 |
commit | 43b1791ec601732ac31195df96781a848360a9ac (patch) | |
tree | daae8d638343295d2f1f7da955e556ef4c958864 /third_party/git/builtin/archive.c | |
parent | 2d8e7dc9d9c38127ec4ebd13aee8e8f586a43318 (diff) |
chore(3p/git): Unvendor git and track patches instead r/2903
This was vendored a long time ago under the expectation that keeping it in sync with cgit would be easier this way, but it has proven not to be a big issue. On the other hand, a vendored copy of git is an annoying maintenance burden. It is much easier to rebase the single (dottime) patch that we have. This removes the vendored copy of git and instead passes the git source code to cgit via `pkgs.srcOnly`, which includes the applied patch so that cgit can continue rendering dottime. Change-Id: If31f62dea7ce688fd1b9050204e9378019775f2b
Diffstat (limited to 'third_party/git/builtin/archive.c')
-rw-r--r-- | third_party/git/builtin/archive.c | 112 |
1 files changed, 0 insertions, 112 deletions
diff --git a/third_party/git/builtin/archive.c b/third_party/git/builtin/archive.c deleted file mode 100644 index 45d11669aae4..000000000000 --- a/third_party/git/builtin/archive.c +++ /dev/null @@ -1,112 +0,0 @@ -/* - * Copyright (c) 2006 Franck Bui-Huu - * Copyright (c) 2006 Rene Scharfe - */ -#include "cache.h" -#include "builtin.h" -#include "archive.h" -#include "transport.h" -#include "parse-options.h" -#include "pkt-line.h" -#include "sideband.h" - -static void create_output_file(const char *output_file) -{ - int output_fd = open(output_file, O_CREAT | O_WRONLY | O_TRUNC, 0666); - if (output_fd < 0) - die_errno(_("could not create archive file '%s'"), output_file); - if (output_fd != 1) { - if (dup2(output_fd, 1) < 0) - die_errno(_("could not redirect output")); - else - close(output_fd); - } -} - -static int run_remote_archiver(int argc, const char **argv, - const char *remote, const char *exec, - const char *name_hint) -{ - int fd[2], i, rv; - struct transport *transport; - struct remote *_remote; - struct packet_reader reader; - - _remote = remote_get(remote); - if (!_remote->url[0]) - die(_("git archive: Remote with no URL")); - transport = transport_get(_remote, _remote->url[0]); - transport_connect(transport, "git-upload-archive", exec, fd); - - /* - * Inject a fake --format field at the beginning of the - * arguments, with the format inferred from our output - * filename. This way explicit --format options can override - * it. - */ - if (name_hint) { - const char *format = archive_format_from_filename(name_hint); - if (format) - packet_write_fmt(fd[1], "argument --format=%s\n", format); - } - for (i = 1; i < argc; i++) - packet_write_fmt(fd[1], "argument %s\n", argv[i]); - packet_flush(fd[1]); - - packet_reader_init(&reader, fd[0], NULL, 0, - PACKET_READ_CHOMP_NEWLINE | - PACKET_READ_DIE_ON_ERR_PACKET); - - if (packet_reader_read(&reader) != PACKET_READ_NORMAL) - die(_("git archive: expected ACK/NAK, got a flush packet")); - if (strcmp(reader.line, "ACK")) { - if (starts_with(reader.line, "NACK ")) - die(_("git archive: NACK %s"), reader.line + 5); - die(_("git archive: protocol error")); - } - - if (packet_reader_read(&reader) != PACKET_READ_FLUSH) - die(_("git archive: expected a flush")); - - /* Now, start reading from fd[0] and spit it out to stdout */ - rv = recv_sideband("archive", fd[0], 1); - rv |= transport_disconnect(transport); - - return !!rv; -} - -#define PARSE_OPT_KEEP_ALL ( PARSE_OPT_KEEP_DASHDASH | \ - PARSE_OPT_KEEP_ARGV0 | \ - PARSE_OPT_KEEP_UNKNOWN | \ - PARSE_OPT_NO_INTERNAL_HELP ) - -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; - struct option local_opts[] = { - OPT_FILENAME('o', "output", &output, - N_("write the archive to this file")), - OPT_STRING(0, "remote", &remote, N_("repo"), - N_("retrieve the archive from remote repository <repo>")), - OPT_STRING(0, "exec", &exec, N_("command"), - N_("path to the remote git-upload-archive command")), - OPT_END() - }; - - argc = parse_options(argc, argv, prefix, local_opts, NULL, - PARSE_OPT_KEEP_ALL); - - init_archivers(); - - if (output) - create_output_file(output); - - if (remote) - return run_remote_archiver(argc, argv, remote, exec, output); - - setvbuf(stderr, NULL, _IOLBF, BUFSIZ); - - return write_archive(argc, argv, prefix, the_repository, output, 0); -} |