git-svn: don't escape tilde ('~') for http(s) URLs

diff --git a/remote.h b/remote.h
index c2f557357fd4a0eb247f0e6f688efd10f946a08a..d2e170ce664c0efd9ded356c171dabf4b26e452c 100644 (file)
--- a/remote.h
+++ b/remote.h
@@ -53,9 +53,9 @@ struct refspec {
        char *dst;
 };
 
-struct ref *alloc_ref(unsigned namelen);
+extern const struct refspec *tag_refspec;
 
-struct ref *alloc_ref_from_str(const char* str);
+struct ref *alloc_ref(const char *name);
 
 struct ref *copy_ref_list(const struct ref *ref);
 
@@ -75,7 +75,6 @@ void ref_remove_duplicates(struct ref *ref_map);
 
 int valid_fetch_refspec(const char *refspec);
 struct refspec *parse_fetch_refspec(int nr_refspec, const char **refspec);
-struct refspec *parse_push_refspec(int nr_refspec, const char **refspec);
 
 int match_refs(struct ref *src, struct ref *dst, struct ref ***dst_tail,
               int nr_refspec, const char **refspec, int all);
@@ -127,4 +126,8 @@ enum match_refs_flags {
        MATCH_REFS_MIRROR       = (1 << 1),
 };
 
+/* Reporting of tracking info */
+int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs);
+int format_tracking_info(struct branch *branch, struct strbuf *sb);
+
 #endif