about summary refs log tree commit diff
path: root/third_party/git/builtin/commit-tree.c
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2021-09-21T10·03+0300
committerVincent Ambo <mail@tazj.in>2021-09-21T11·29+0300
commit43b1791ec601732ac31195df96781a848360a9ac (patch)
treedaae8d638343295d2f1f7da955e556ef4c958864 /third_party/git/builtin/commit-tree.c
parent2d8e7dc9d9c38127ec4ebd13aee8e8f586a43318 (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/commit-tree.c')
-rw-r--r--third_party/git/builtin/commit-tree.c152
1 files changed, 0 insertions, 152 deletions
diff --git a/third_party/git/builtin/commit-tree.c b/third_party/git/builtin/commit-tree.c
deleted file mode 100644
index 1031b9a491c5..000000000000
--- a/third_party/git/builtin/commit-tree.c
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * GIT - The information manager from hell
- *
- * Copyright (C) Linus Torvalds, 2005
- */
-#include "cache.h"
-#include "config.h"
-#include "object-store.h"
-#include "repository.h"
-#include "commit.h"
-#include "tree.h"
-#include "builtin.h"
-#include "utf8.h"
-#include "gpg-interface.h"
-#include "parse-options.h"
-
-static const char * const commit_tree_usage[] = {
-	N_("git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] "
-		"[(-F <file>)...] <tree>"),
-	NULL
-};
-
-static const char *sign_commit;
-
-static void new_parent(struct commit *parent, struct commit_list **parents_p)
-{
-	struct object_id *oid = &parent->object.oid;
-	struct commit_list *parents;
-	for (parents = *parents_p; parents; parents = parents->next) {
-		if (parents->item == parent) {
-			error(_("duplicate parent %s ignored"), oid_to_hex(oid));
-			return;
-		}
-		parents_p = &parents->next;
-	}
-	commit_list_insert(parent, parents_p);
-}
-
-static int commit_tree_config(const char *var, const char *value, void *cb)
-{
-	int status = git_gpg_config(var, value, NULL);
-	if (status)
-		return status;
-	return git_default_config(var, value, cb);
-}
-
-static int parse_parent_arg_callback(const struct option *opt,
-		const char *arg, int unset)
-{
-	struct object_id oid;
-	struct commit_list **parents = opt->value;
-
-	BUG_ON_OPT_NEG_NOARG(unset, arg);
-
-	if (get_oid_commit(arg, &oid))
-		die(_("not a valid object name %s"), arg);
-
-	assert_oid_type(&oid, OBJ_COMMIT);
-	new_parent(lookup_commit(the_repository, &oid), parents);
-	return 0;
-}
-
-static int parse_message_arg_callback(const struct option *opt,
-		const char *arg, int unset)
-{
-	struct strbuf *buf = opt->value;
-
-	BUG_ON_OPT_NEG_NOARG(unset, arg);
-
-	if (buf->len)
-		strbuf_addch(buf, '\n');
-	strbuf_addstr(buf, arg);
-	strbuf_complete_line(buf);
-
-	return 0;
-}
-
-static int parse_file_arg_callback(const struct option *opt,
-		const char *arg, int unset)
-{
-	int fd;
-	struct strbuf *buf = opt->value;
-
-	BUG_ON_OPT_NEG_NOARG(unset, arg);
-
-	if (buf->len)
-		strbuf_addch(buf, '\n');
-	if (!strcmp(arg, "-"))
-		fd = 0;
-	else {
-		fd = open(arg, O_RDONLY);
-		if (fd < 0)
-			die_errno(_("git commit-tree: failed to open '%s'"), arg);
-	}
-	if (strbuf_read(buf, fd, 0) < 0)
-		die_errno(_("git commit-tree: failed to read '%s'"), arg);
-	if (fd && close(fd))
-		die_errno(_("git commit-tree: failed to close '%s'"), arg);
-
-	return 0;
-}
-
-int cmd_commit_tree(int argc, const char **argv, const char *prefix)
-{
-	static struct strbuf buffer = STRBUF_INIT;
-	struct commit_list *parents = NULL;
-	struct object_id tree_oid;
-	struct object_id commit_oid;
-
-	struct option options[] = {
-		OPT_CALLBACK_F('p', NULL, &parents, N_("parent"),
-			N_("id of a parent commit object"), PARSE_OPT_NONEG,
-			parse_parent_arg_callback),
-		OPT_CALLBACK_F('m', NULL, &buffer, N_("message"),
-			N_("commit message"), PARSE_OPT_NONEG,
-			parse_message_arg_callback),
-		OPT_CALLBACK_F('F', NULL, &buffer, N_("file"),
-			N_("read commit log message from file"), PARSE_OPT_NONEG,
-			parse_file_arg_callback),
-		{ OPTION_STRING, 'S', "gpg-sign", &sign_commit, N_("key-id"),
-			N_("GPG sign commit"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
-		OPT_END()
-	};
-
-	git_config(commit_tree_config, NULL);
-
-	if (argc < 2 || !strcmp(argv[1], "-h"))
-		usage_with_options(commit_tree_usage, options);
-
-	argc = parse_options(argc, argv, prefix, options, commit_tree_usage, 0);
-
-	if (argc != 1)
-		die(_("must give exactly one tree"));
-
-	if (get_oid_tree(argv[0], &tree_oid))
-		die(_("not a valid object name %s"), argv[0]);
-
-	if (!buffer.len) {
-		if (strbuf_read(&buffer, 0, 0) < 0)
-			die_errno(_("git commit-tree: failed to read"));
-	}
-
-	if (commit_tree(buffer.buf, buffer.len, &tree_oid, parents, &commit_oid,
-			NULL, sign_commit)) {
-		strbuf_release(&buffer);
-		return 1;
-	}
-
-	printf("%s\n", oid_to_hex(&commit_oid));
-	strbuf_release(&buffer);
-	return 0;
-}