From 43b1791ec601732ac31195df96781a848360a9ac Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
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/env--helper.c | 100 ----------------------------------
 1 file changed, 100 deletions(-)
 delete mode 100644 third_party/git/builtin/env--helper.c

(limited to 'third_party/git/builtin/env--helper.c')

diff --git a/third_party/git/builtin/env--helper.c b/third_party/git/builtin/env--helper.c
deleted file mode 100644
index 27349098b074..000000000000
--- a/third_party/git/builtin/env--helper.c
+++ /dev/null
@@ -1,100 +0,0 @@
-#include "builtin.h"
-#include "config.h"
-#include "parse-options.h"
-
-static char const * const env__helper_usage[] = {
-	N_("git env--helper --type=[bool|ulong] <options> <env-var>"),
-	NULL
-};
-
-enum cmdmode {
-	ENV_HELPER_TYPE_BOOL = 1,
-	ENV_HELPER_TYPE_ULONG
-};
-
-static int option_parse_type(const struct option *opt, const char *arg,
-			     int unset)
-{
-	enum cmdmode *cmdmode = opt->value;
-
-	BUG_ON_OPT_NEG(unset);
-
-	if (!strcmp(arg, "bool"))
-		*cmdmode = ENV_HELPER_TYPE_BOOL;
-	else if (!strcmp(arg, "ulong"))
-		*cmdmode = ENV_HELPER_TYPE_ULONG;
-	else
-		die(_("unrecognized --type argument, %s"), arg);
-
-	return 0;
-}
-
-int cmd_env__helper(int argc, const char **argv, const char *prefix)
-{
-	int exit_code = 0;
-	const char *env_variable = NULL;
-	const char *env_default = NULL;
-	int ret;
-	int ret_int, default_int;
-	unsigned long ret_ulong, default_ulong;
-	enum cmdmode cmdmode = 0;
-	struct option opts[] = {
-		OPT_CALLBACK_F(0, "type", &cmdmode, N_("type"),
-			       N_("value is given this type"), PARSE_OPT_NONEG,
-			       option_parse_type),
-		OPT_STRING(0, "default", &env_default, N_("value"),
-			   N_("default for git_env_*(...) to fall back on")),
-		OPT_BOOL(0, "exit-code", &exit_code,
-			 N_("be quiet only use git_env_*() value as exit code")),
-		OPT_END(),
-	};
-
-	argc = parse_options(argc, argv, prefix, opts, env__helper_usage,
-			     PARSE_OPT_KEEP_UNKNOWN);
-	if (env_default && !*env_default)
-		usage_with_options(env__helper_usage, opts);
-	if (!cmdmode)
-		usage_with_options(env__helper_usage, opts);
-	if (argc != 1)
-		usage_with_options(env__helper_usage, opts);
-	env_variable = argv[0];
-
-	switch (cmdmode) {
-	case ENV_HELPER_TYPE_BOOL:
-		if (env_default) {
-			default_int = git_parse_maybe_bool(env_default);
-			if (default_int == -1) {
-				error(_("option `--default' expects a boolean value with `--type=bool`, not `%s`"),
-				      env_default);
-				usage_with_options(env__helper_usage, opts);
-			}
-		} else {
-			default_int = 0;
-		}
-		ret_int = git_env_bool(env_variable, default_int);
-		if (!exit_code)
-			puts(ret_int ? "true" : "false");
-		ret = ret_int;
-		break;
-	case ENV_HELPER_TYPE_ULONG:
-		if (env_default) {
-			if (!git_parse_ulong(env_default, &default_ulong)) {
-				error(_("option `--default' expects an unsigned long value with `--type=ulong`, not `%s`"),
-				      env_default);
-				usage_with_options(env__helper_usage, opts);
-			}
-		} else {
-			default_ulong = 0;
-		}
-		ret_ulong = git_env_ulong(env_variable, default_ulong);
-		if (!exit_code)
-			printf("%lu\n", ret_ulong);
-		ret = ret_ulong;
-		break;
-	default:
-		BUG("unknown <type> value");
-		break;
-	}
-
-	return !ret;
-}
-- 
cgit 1.4.1