Merge branch 'js/attach'

diff --git a/fetch.h b/fetch.h
index 001a6b8e2dccc02a64266ae804227674ee71338c..be48c6f19092a81672dd24eb38e9ffca39f5b53c 100644 (file)
--- a/fetch.h
+++ b/fetch.h
@@ -22,9 +22,6 @@ extern void prefetch(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;
-
 /* Set to fetch the target tree. */
 extern int get_tree;
 
@@ -43,6 +40,15 @@ extern int get_recover;
 /* Report what we got under get_verbosely */
 extern void pull_say(const char *, const char *);
 
-extern int pull(char *target);
+/* Load pull targets from stdin */
+extern int pull_targets_stdin(char ***target, const char ***write_ref);
+
+/* Free up loaded targets */
+extern void pull_targets_free(int targets, char **target, const char **write_ref);
+
+/* If write_ref is set, the ref filename to write the target value to. */
+/* If write_ref_log_details is set, additional text will appear in the ref log. */
+extern int pull(int targets, char **target, const char **write_ref,
+               const char *write_ref_log_details);
 
 #endif /* PULL_H */