Merge branch 'en/merge-options-ff-and-friends'

diff --git a/fetch-negotiator.h b/fetch-negotiator.h
index 9e3967ce6626be459ad7d8a0590240b06e7056e3..ea78868504bdcff0121c40cd40b6857df1680cfc 100644 (file)
--- a/fetch-negotiator.h
+++ b/fetch-negotiator.h
@@ -2,6 +2,7 @@
 #define FETCH_NEGOTIATOR_H
 
 struct commit;
+struct repository;
 
 /*
  * An object that supplies the information needed to negotiate the contents of
@@ -52,7 +53,7 @@ struct fetch_negotiator {
        void *data;
 };
 
-void fetch_negotiator_init(struct fetch_negotiator *negotiator,
-                          const char *algorithm);
+void fetch_negotiator_init(struct repository *r,
+                          struct fetch_negotiator *negotiator);
 
 #endif