Merge git://repo.or.cz/git-gui

diff --git a/remote.h b/remote.h
index 0f6033fb258c5a44971c7479e1dfe938393ce398..7e9ae792dc69bb8b07cb9b8cf4e53845595d320e 100644 (file)
--- a/remote.h
+++ b/remote.h
@@ -25,6 +25,7 @@ struct remote {
         * 2 to always fetch tags
         */
        int fetch_tags;
+       int skip_default_update;
 
        const char *receivepack;
        const char *uploadpack;
@@ -66,7 +67,8 @@ void free_refs(struct ref *ref);
  */
 void ref_remove_duplicates(struct ref *ref_map);
 
-struct refspec *parse_ref_spec(int nr_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);