Make fetch-pack a builtin with an internal API

diff --git a/remote.h b/remote.h
index 080b7dab99348952d8d89fef428a317b1c4bd055..f21b6a6da1f85eb0818ea55ad43368a1e7cf5e33 100644 (file)
--- a/remote.h
+++ b/remote.h
@@ -16,17 +16,21 @@ struct remote {
        int fetch_refspec_nr;
 
        const char *receivepack;
+       const char *uploadpack;
 };
 
 struct remote *remote_get(const char *name);
 
+typedef int each_remote_fn(struct remote *remote, void *priv);
+int for_each_remote(each_remote_fn fn, void *priv);
+
 int remote_has_uri(struct remote *remote, const char *uri);
 
 struct refspec {
        unsigned force : 1;
        unsigned pattern : 1;
 
-       const char *src;
+       char *src;
        char *dst;
 };
 
@@ -45,4 +49,22 @@ int match_refs(struct ref *src, struct ref *dst, struct ref ***dst_tail,
  */
 int remote_find_tracking(struct remote *remote, struct refspec *refspec);
 
+struct branch {
+       const char *name;
+       const char *refname;
+
+       const char *remote_name;
+       struct remote *remote;
+
+       const char **merge_name;
+       struct refspec **merge;
+       int merge_nr;
+};
+
+struct branch *branch_get(const char *name);
+
+int branch_has_merge_config(struct branch *branch);
+
+int branch_merges(struct branch *branch, const char *refname);
+
 #endif