Fix up git-merge-one-file-script

diff --git a/pull.h b/pull.h
index 314bc7e95ab1a73634f6a96a8a3782fda91ea261..bd5e7bdeb316ecf1ccc01f0d23d710dcd7813242 100644 (file)
--- a/pull.h
+++ b/pull.h
@@ -4,6 +4,14 @@
 /** To be provided by the particular implementation. **/
 extern int fetch(unsigned char *sha1);
 
+extern int fetch_ref(char *ref, unsigned char *sha1);
+
+/** If set, the ref filename to write the target value to. **/
+extern const char *write_ref;
+
+/** If set, the hash that the current value of write_ref must be. **/
+extern const unsigned char *current_ref;
+
 /** Set to fetch the target tree. */
 extern int get_tree;
 
@@ -13,6 +21,17 @@ extern int get_history;
 /** Set to fetch the trees in the commit history. **/
 extern int get_all;
 
+/* Set to zero to skip the check for delta object base;
+ * set to two to check delta dependency even for objects we already have.
+ */
+extern int get_delta;
+
+/* Set to be verbose */
+extern int get_verbosely;
+
+/* Report what we got under get_verbosely */
+extern void pull_say(const char *, const char *);
+
 extern int pull(char *target);
 
 #endif /* PULL_H */