Merge branch 'rr/triangle'

diff --git a/fetch-pack.h b/fetch-pack.h
index 0608edae3fe7b07b852b30281fea978806798c99..dc5266c970655a9fe4f971a0132c14e1cf731acc 100644 (file)
--- a/fetch-pack.h
+++ b/fetch-pack.h
@@ -1,6 +1,8 @@
 #ifndef FETCH_PACK_H
 #define FETCH_PACK_H
 
+#include "string-list.h"
+
 struct fetch_pack_args {
        const char *uploadpack;
        int unpacklimit;
@@ -10,18 +12,24 @@ struct fetch_pack_args {
                lock_pack:1,
                use_thin_pack:1,
                fetch_all:1,
+               stdin_refs:1,
                verbose:1,
                no_progress:1,
                include_tag:1,
                stateless_rpc:1;
 };
 
+/*
+ * sought represents remote references that should be updated from.
+ * On return, the names that were found on the remote will have been
+ * marked as such.
+ */
 struct ref *fetch_pack(struct fetch_pack_args *args,
-               int fd[], struct child_process *conn,
-               const struct ref *ref,
-               const char *dest,
-               int nr_heads,
-               char **heads,
-               char **pack_lockfile);
+                      int fd[], struct child_process *conn,
+                      const struct ref *ref,
+                      const char *dest,
+                      struct ref **sought,
+                      int nr_sought,
+                      char **pack_lockfile);
 
 #endif