Merge git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/transport.h b/transport.h
index 8abfc0ae60c18165b44ef93ed9115972b991e2dc..6bbc1a82642ab9e5722cfe6ab34ec4246b3a9dd4 100644 (file)
--- a/transport.h
+++ b/transport.h
@@ -19,12 +19,14 @@ struct transport {
                          const char *value);
 
        struct ref *(*get_refs_list)(struct transport *transport);
-       int (*fetch)(struct transport *transport, int refs_nr, struct ref **refs);
+       int (*fetch)(struct transport *transport, int refs_nr, const struct ref **refs);
        int (*push)(struct transport *connection, int refspec_nr, const char **refspec, int flags);
 
        int (*disconnect)(struct transport *connection);
        char *pack_lockfile;
        signed verbose : 2;
+       /* Force progress even if the output is not a tty */
+       unsigned progress : 1;
 };
 
 #define TRANSPORT_PUSH_ALL 1
@@ -68,7 +70,7 @@ int transport_push(struct transport *connection,
 
 const struct ref *transport_get_remote_refs(struct transport *transport);
 
-int transport_fetch_refs(struct transport *transport, struct ref *refs);
+int transport_fetch_refs(struct transport *transport, const struct ref *refs);
 void transport_unlock_pack(struct transport *transport);
 int transport_disconnect(struct transport *transport);