revert(3p/git): Revert merge of git upstream at v2.26.2 r/852

This causes cgit to serve error pages, which is undesirable.

This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing
changes made to f2b211131f2347342dde63975b09cf603149f1a3.

1 files changed, 1 insertions, 35 deletions

diff --git a/third_party/git/repository.h b/third_party/git/repository.h
index 040057dea6f4..4fb6a5885f79 100644
--- a/third_party/git/repository.h
+++ b/third_party/git/repository.h
@@ -11,34 +11,6 @@ struct pathspec;
 struct raw_object_store;
 struct submodule_cache;
 
-enum untracked_cache_setting {
-	UNTRACKED_CACHE_UNSET = -1,
-	UNTRACKED_CACHE_REMOVE = 0,
-	UNTRACKED_CACHE_KEEP = 1,
-	UNTRACKED_CACHE_WRITE = 2
-};
-
-enum fetch_negotiation_setting {
-	FETCH_NEGOTIATION_UNSET = -1,
-	FETCH_NEGOTIATION_NONE = 0,
-	FETCH_NEGOTIATION_DEFAULT = 1,
-	FETCH_NEGOTIATION_SKIPPING = 2,
-};
-
-struct repo_settings {
-	int initialized;
-
-	int core_commit_graph;
-	int gc_write_commit_graph;
-	int fetch_write_commit_graph;
-
-	int index_version;
-	enum untracked_cache_setting core_untracked_cache;
-
-	int pack_use_sparse;
-	enum fetch_negotiation_setting fetch_negotiation_algorithm;
-};
-
 struct repository {
 	/* Environment */
 	/*
@@ -100,8 +72,6 @@ struct repository {
 	 */
 	char *submodule_prefix;
 
-	struct repo_settings settings;
-
 	/* Subsystems */
 	/*
 	 * Repository's config which contains key-value pairs from the usual
@@ -125,9 +95,6 @@ struct repository {
 	/* A unique-id for tracing purposes. */
 	int trace2_repo_id;
 
-	/* True if commit-graph has been disabled within this process. */
-	int commit_graph_disabled;
-
 	/* Configurations */
 
 	/* Indicate if a repository has a different 'commondir' from 'gitdir' */
@@ -172,7 +139,7 @@ void repo_clear(struct repository *repo);
  * be allocated if needed.
  *
  * Return the number of index entries in the populated index or a value less
- * than zero if an error occurred.  If the repository's index has already been
+ * than zero if an error occured.  If the repository's index has already been
  * populated then the number of entries will simply be returned.
  */
 int repo_read_index(struct repository *repo);
@@ -190,6 +157,5 @@ int repo_read_index_unmerged(struct repository *);
  */
 void repo_update_index_if_able(struct repository *, struct lock_file *);
 
-void prepare_repo_settings(struct repository *r);
 
 #endif /* REPOSITORY_H */