Merge branch 'bw/rebase-autostash-keep-current-branch'

diff --git a/fetch-negotiator.h b/fetch-negotiator.h
index ddb44a22dce42b5cce8f747987e0848483350993..ea78868504bdcff0121c40cd40b6857df1680cfc 100644 (file)
--- a/fetch-negotiator.h
+++ b/fetch-negotiator.h
@@ -1,7 +1,8 @@
-#ifndef FETCH_NEGOTIATOR
-#define FETCH_NEGOTIATOR
+#ifndef FETCH_NEGOTIATOR_H
+#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