xdl_merge(): make XDL_MERGE_ZEALOUS output simpler

diff --git a/remote.h b/remote.h
index 6a4c7a0f37720a41d70ee4099d6e91c31ab69375..86e036d61006a577ad091bdc30e58987871415b0 100644 (file)
--- a/remote.h
+++ b/remote.h
@@ -25,6 +25,11 @@ struct remote {
 
        const char *receivepack;
        const char *uploadpack;
+
+       /*
+        * for curl remotes only
+        */
+       char *http_proxy;
 };
 
 struct remote *remote_get(const char *name);
@@ -102,4 +107,11 @@ struct branch *branch_get(const char *name);
 int branch_has_merge_config(struct branch *branch);
 int branch_merge_matches(struct branch *, int n, const char *);
 
+/* Flags to match_refs. */
+enum match_refs_flags {
+       MATCH_REFS_NONE         = 0,
+       MATCH_REFS_ALL          = (1 << 0),
+       MATCH_REFS_MIRROR       = (1 << 1),
+};
+
 #endif