Merge master branch changes into release candidate branch.

diff --git a/pull.h b/pull.h
index ddcca60e21b836973bf8ce2a57f7b516bceae704..e7710e89e710979283f82fe3e67ca1296e70b556 100644 (file)
--- a/pull.h
+++ b/pull.h
@@ -8,6 +8,13 @@
  */
 extern int fetch(unsigned char *sha1);
 
+/*
+ * Fetch the specified object and store it locally; fetch() will be
+ * called later to determine success. To be provided by the particular
+ * implementation.
+ */
+extern void prefetch(unsigned char *sha1);
+
 /*
  * Fetch ref (relative to $GIT_DIR/refs) from the remote, and store
  * the 20-byte SHA1 in sha1.  Return 0 on success, -1 on failure.  To
@@ -30,11 +37,6 @@ 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;