about summary refs log tree commit diff
path: root/third_party/git/fetch-negotiator.h
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
committerVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
commit93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch)
tree85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/fetch-negotiator.h
parent6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff)
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.
Diffstat (limited to 'third_party/git/fetch-negotiator.h')
-rw-r--r--third_party/git/fetch-negotiator.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/third_party/git/fetch-negotiator.h b/third_party/git/fetch-negotiator.h
index ea78868504bd..9e3967ce6626 100644
--- a/third_party/git/fetch-negotiator.h
+++ b/third_party/git/fetch-negotiator.h
@@ -2,7 +2,6 @@
 #define FETCH_NEGOTIATOR_H
 
 struct commit;
-struct repository;
 
 /*
  * An object that supplies the information needed to negotiate the contents of
@@ -53,7 +52,7 @@ struct fetch_negotiator {
 	void *data;
 };
 
-void fetch_negotiator_init(struct repository *r,
-			   struct fetch_negotiator *negotiator);
+void fetch_negotiator_init(struct fetch_negotiator *negotiator,
+			   const char *algorithm);
 
 #endif