Merge branch 'jc/fetchupload' into next

diff --git a/fetch.h b/fetch.h
index e7710e89e710979283f82fe3e67ca1296e70b556..841bb1af9cab0c19dda3f0cb5956edaec22f9d3a 100644 (file)
--- a/fetch.h
+++ b/fetch.h
@@ -25,8 +25,8 @@ 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;
+/* If set additional text will appear in the ref log. */
+extern const char *write_ref_log_details;
 
 /* Set to fetch the target tree. */
 extern int get_tree;
@@ -40,6 +40,9 @@ extern int get_all;
 /* Set to be verbose */
 extern int get_verbosely;
 
+/* Set to check on all reachable objects. */
+extern int get_recover;
+
 /* Report what we got under get_verbosely */
 extern void pull_say(const char *, const char *);