From 43b1791ec601732ac31195df96781a848360a9ac Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 21 Sep 2021 13:03:01 +0300 Subject: chore(3p/git): Unvendor git and track patches instead 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 --- third_party/git/builtin/column.c | 59 ---------------------------------------- 1 file changed, 59 deletions(-) delete mode 100644 third_party/git/builtin/column.c (limited to 'third_party/git/builtin/column.c') diff --git a/third_party/git/builtin/column.c b/third_party/git/builtin/column.c deleted file mode 100644 index e815e148aa18..000000000000 --- a/third_party/git/builtin/column.c +++ /dev/null @@ -1,59 +0,0 @@ -#include "builtin.h" -#include "cache.h" -#include "config.h" -#include "strbuf.h" -#include "parse-options.h" -#include "string-list.h" -#include "column.h" - -static const char * const builtin_column_usage[] = { - N_("git column []"), - NULL -}; -static unsigned int colopts; - -static int column_config(const char *var, const char *value, void *cb) -{ - return git_column_config(var, value, cb, &colopts); -} - -int cmd_column(int argc, const char **argv, const char *prefix) -{ - struct string_list list = STRING_LIST_INIT_DUP; - struct strbuf sb = STRBUF_INIT; - struct column_options copts; - const char *command = NULL, *real_command = NULL; - struct option options[] = { - OPT_STRING(0, "command", &real_command, N_("name"), N_("lookup config vars")), - OPT_COLUMN(0, "mode", &colopts, N_("layout to use")), - OPT_INTEGER(0, "raw-mode", &colopts, N_("layout to use")), - OPT_INTEGER(0, "width", &copts.width, N_("Maximum width")), - OPT_STRING(0, "indent", &copts.indent, N_("string"), N_("Padding space on left border")), - OPT_INTEGER(0, "nl", &copts.nl, N_("Padding space on right border")), - OPT_INTEGER(0, "padding", &copts.padding, N_("Padding space between columns")), - OPT_END() - }; - - /* This one is special and must be the first one */ - if (argc > 1 && starts_with(argv[1], "--command=")) { - command = argv[1] + 10; - git_config(column_config, (void *)command); - } else - git_config(column_config, NULL); - - memset(&copts, 0, sizeof(copts)); - copts.padding = 1; - argc = parse_options(argc, argv, prefix, options, builtin_column_usage, 0); - if (argc) - usage_with_options(builtin_column_usage, options); - if (real_command || command) { - if (!real_command || !command || strcmp(real_command, command)) - die(_("--command must be the first argument")); - } - finalize_colopts(&colopts, -1); - while (!strbuf_getline(&sb, stdin)) - string_list_append(&list, sb.buf); - - print_columns(&list, colopts, &copts); - return 0; -} -- cgit 1.4.1