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/write-tree.c | 57 ------------------------------------ 1 file changed, 57 deletions(-) delete mode 100644 third_party/git/builtin/write-tree.c (limited to 'third_party/git/builtin/write-tree.c') diff --git a/third_party/git/builtin/write-tree.c b/third_party/git/builtin/write-tree.c deleted file mode 100644 index 45d61707e7d1..000000000000 --- a/third_party/git/builtin/write-tree.c +++ /dev/null @@ -1,57 +0,0 @@ -/* - * GIT - The information manager from hell - * - * Copyright (C) Linus Torvalds, 2005 - */ -#define USE_THE_INDEX_COMPATIBILITY_MACROS -#include "builtin.h" -#include "cache.h" -#include "config.h" -#include "tree.h" -#include "cache-tree.h" -#include "parse-options.h" - -static const char * const write_tree_usage[] = { - N_("git write-tree [--missing-ok] [--prefix=/]"), - NULL -}; - -int cmd_write_tree(int argc, const char **argv, const char *cmd_prefix) -{ - int flags = 0, ret; - const char *tree_prefix = NULL; - struct object_id oid; - const char *me = "git-write-tree"; - struct option write_tree_options[] = { - OPT_BIT(0, "missing-ok", &flags, N_("allow missing objects"), - WRITE_TREE_MISSING_OK), - OPT_STRING(0, "prefix", &tree_prefix, N_("/"), - N_("write tree object for a subdirectory ")), - { OPTION_BIT, 0, "ignore-cache-tree", &flags, NULL, - N_("only useful for debugging"), - PARSE_OPT_HIDDEN | PARSE_OPT_NOARG, NULL, - WRITE_TREE_IGNORE_CACHE_TREE }, - OPT_END() - }; - - git_config(git_default_config, NULL); - argc = parse_options(argc, argv, cmd_prefix, write_tree_options, - write_tree_usage, 0); - - ret = write_cache_as_tree(&oid, flags, tree_prefix); - switch (ret) { - case 0: - printf("%s\n", oid_to_hex(&oid)); - break; - case WRITE_TREE_UNREADABLE_INDEX: - die("%s: error reading the index", me); - break; - case WRITE_TREE_UNMERGED_INDEX: - die("%s: error building trees", me); - break; - case WRITE_TREE_PREFIX_ERROR: - die("%s: prefix %s not found", me, tree_prefix); - break; - } - return ret; -} -- cgit 1.4.1