summaryrefslogtreecommitdiff
path: root/remote.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-06-21 04:47:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-06-21 04:47:27 (GMT)
commitdeded16d151ff0f7b80ed21a518928daff09c14c (patch)
tree3a835595f493e9894f84a43ac88d7e71c42f1cd4 /remote.h
parent974e6e42f7a66b69bd684af4f637ab064acfdf92 (diff)
parentce61595ea7eb3df22f6a943a38a273141f1af978 (diff)
downloadgit-deded16d151ff0f7b80ed21a518928daff09c14c.zip
git-deded16d151ff0f7b80ed21a518928daff09c14c.tar.gz
git-deded16d151ff0f7b80ed21a518928daff09c14c.tar.bz2
Merge branch 'mg/pushurl'
* mg/pushurl: avoid NULL dereference on failed malloc builtin-remote: Make "remote -v" display push urls builtin-remote: Show push urls as well technical/api-remote: Describe new struct remote member pushurl t5516: Check pushurl config setting Allow push and fetch urls to be different
Diffstat (limited to 'remote.h')
-rw-r--r--remote.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/remote.h b/remote.h
index 257a555..5db8420 100644
--- a/remote.h
+++ b/remote.h
@@ -15,6 +15,10 @@ struct remote {
int url_nr;
int url_alloc;
+ const char **pushurl;
+ int pushurl_nr;
+ int pushurl_alloc;
+
const char **push_refspec;
struct refspec *push;
int push_refspec_nr;