Merge branch 'bc/send-email-auto-cte'

diff --git a/refspec.h b/refspec.h
index da3135825f93d21db7f8940799a8b2f39f577b28..9b6e64a824e4be1025f3f0a07fa5a59296698489 100644 (file)
--- a/refspec.h
+++ b/refspec.h
@@ -14,12 +14,6 @@ struct refspec_item {
        char *dst;
 };
 
-int valid_fetch_refspec(const char *refspec);
-struct refspec_item *parse_fetch_refspec(int nr_refspec, const char **refspec);
-struct refspec_item *parse_push_refspec(int nr_refspec, const char **refspec);
-
-void free_refspec(int nr_refspec, struct refspec_item *refspec);
-
 #define REFSPEC_FETCH 1
 #define REFSPEC_PUSH 0
 
@@ -38,11 +32,24 @@ struct refspec {
        int fetch;
 };
 
-void refspec_item_init(struct refspec_item *item, const char *refspec, int fetch);
+int refspec_item_init(struct refspec_item *item, const char *refspec,
+                     int fetch);
+void refspec_item_init_or_die(struct refspec_item *item, const char *refspec,
+                             int fetch);
 void refspec_item_clear(struct refspec_item *item);
 void refspec_init(struct refspec *rs, int fetch);
 void refspec_append(struct refspec *rs, const char *refspec);
 void refspec_appendn(struct refspec *rs, const char **refspecs, int nr);
 void refspec_clear(struct refspec *rs);
 
+int valid_fetch_refspec(const char *refspec);
+
+struct argv_array;
+/*
+ * Determine what <prefix> values to pass to the peer in ref-prefix lines
+ * (see Documentation/technical/protocol-v2.txt).
+ */
+void refspec_ref_prefixes(const struct refspec *rs,
+                         struct argv_array *ref_prefixes);
+
 #endif /* REFSPEC_H */