diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-06-20 21:47:27 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-06-20 21:47:27 -0700 |
commit | deded16d151ff0f7b80ed21a518928daff09c14c (patch) | |
tree | 3a835595f493e9894f84a43ac88d7e71c42f1cd4 /remote.h | |
parent | 974e6e42f7a66b69bd684af4f637ab064acfdf92 (diff) | |
parent | ce61595ea7eb3df22f6a943a38a273141f1af978 (diff) | |
download | git-deded16d151ff0f7b80ed21a518928daff09c14c.tar.gz |
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.h | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -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; |