about summary refs log tree commit diff
path: root/third_party/git/notes-utils.h
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/notes-utils.h
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/notes-utils.h')
-rw-r--r--third_party/git/notes-utils.h55
1 files changed, 0 insertions, 55 deletions
diff --git a/third_party/git/notes-utils.h b/third_party/git/notes-utils.h
deleted file mode 100644
index d9b3c09eaf09..000000000000
--- a/third_party/git/notes-utils.h
+++ /dev/null
@@ -1,55 +0,0 @@
-#ifndef NOTES_UTILS_H
-#define NOTES_UTILS_H
-
-#include "notes.h"
-
-struct commit_list;
-struct object_id;
-struct repository;
-
-/*
- * Create new notes commit from the given notes tree
- *
- * Properties of the created commit:
- * - tree: the result of converting t to a tree object with write_notes_tree().
- * - parents: the given parents OR (if NULL) the commit referenced by t->ref.
- * - author/committer: the default determined by commit_tree().
- * - commit message: msg
- *
- * The resulting commit SHA1 is stored in result_sha1.
- */
-void create_notes_commit(struct repository *r,
-			 struct notes_tree *t,
-			 struct commit_list *parents,
-			 const char *msg, size_t msg_len,
-			 struct object_id *result_oid);
-
-void commit_notes(struct repository *r, struct notes_tree *t, const char *msg);
-
-enum notes_merge_strategy {
-		NOTES_MERGE_RESOLVE_MANUAL = 0,
-		NOTES_MERGE_RESOLVE_OURS,
-		NOTES_MERGE_RESOLVE_THEIRS,
-		NOTES_MERGE_RESOLVE_UNION,
-		NOTES_MERGE_RESOLVE_CAT_SORT_UNIQ
-};
-
-struct notes_rewrite_cfg {
-	struct notes_tree **trees;
-	const char *cmd;
-	int enabled;
-	combine_notes_fn combine;
-	struct string_list *refs;
-	int refs_from_env;
-	int mode_from_env;
-};
-
-int parse_notes_merge_strategy(const char *v, enum notes_merge_strategy *s);
-struct notes_rewrite_cfg *init_copy_notes_for_rewrite(const char *cmd);
-int copy_note_for_rewrite(struct notes_rewrite_cfg *c,
-			  const struct object_id *from_obj, const struct object_id *to_obj);
-void finish_copy_notes_for_rewrite(struct repository *r,
-				   struct notes_rewrite_cfg *c,
-				   const char *msg);
-
-#endif