From 302f0e0f9ae363093880573152004e4fdecc2012 Mon Sep 17 00:00:00 2001
From: "Kyle J. McKay" <mackyle@gmail.com>
Date: Fri, 31 May 2013 03:12:55 -0700
Subject: [PATCH] Support multiple push URLs

---
 Girocco/Config.pm         |  3 +++
 git.git                   |  2 +-
 gitweb/gitweb_config.perl | 12 ++++++++++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Girocco/Config.pm b/Girocco/Config.pm
index 63d870d..ce06002 100644
--- a/Girocco/Config.pm
+++ b/Girocco/Config.pm
@@ -102,6 +102,9 @@ our $htmlurl = "http://repo.or.cz/h";
 # HTTP URL of the repository collection (undef if N/A)
 our $httppullurl = "http://repo.or.cz/r";
 
+# HTTPS push URL of the repository collection (undef if N/A)
+our $httpspushurl = undef;
+
 # Git URL of the repository collection (undef if N/A)
 # (You need to set up git-daemon on your system, and Girocco will not
 # do this particular thing for you.)
diff --git a/git.git b/git.git
index 8e53eab..088f314 160000
--- a/git.git
+++ b/git.git
@@ -1 +1 @@
-Subproject commit 8e53eab03247481fe6e49ad6847b5679f8c13853
+Subproject commit 088f3145c45568fab6aebe845c7916641ea0eeb9
diff --git a/gitweb/gitweb_config.perl b/gitweb/gitweb_config.perl
index 14f3f50..54a7503 100644
--- a/gitweb/gitweb_config.perl
+++ b/gitweb/gitweb_config.perl
@@ -33,6 +33,10 @@ $feature{'snapshot'}{'default'} = ['tgz', 'zip'];
 # Base web path
 our $my_uri = $Girocco::Config::gitweburl;
 
+# https hint html inserted right after any https push URL (undef for none)
+# e.g. "<a href="https_push_instructions.html">https push instructions</a>"
+our $https_hint_html = undef;
+
 ## core git executable to use
 ## this can just be "git" if your webserver has a sensible PATH
 our $GIT = $Girocco::Config::git_bin;
@@ -65,13 +69,17 @@ our $blamejs = "$Girocco::Config::gitwebfiles/blame.js";
 ## URI of gitweb.js
 our $gitwebjs = "$Girocco::Config::gitwebfiles/gitweb.js";
 #
-## list of git base URLs used for URL to where fetch project from,
+## list of git base URLs used for URL to fetch project from,
 ## i.e. full URL is "$git_base_url/$project"
 our @git_base_url_list = ();
 $Girocco::Config::gitpullurl and push @git_base_url_list, $Girocco::Config::gitpullurl;
 $Girocco::Config::httppullurl and push @git_base_url_list, $Girocco::Config::httppullurl;
 #
-our $git_base_push_url = $Girocco::Config::pushurl;
+## list of git base URLs used for URL to push project to,
+## i.e. full URL is "$git_base_push_url/$project"
+our @git_base_push_urls = ();
+$Girocco::Config::pushurl and push @git_base_push_urls, $Girocco::Config::pushurl;
+$Girocco::Config::httpspushurl and push @git_base_push_urls, $Girocco::Config::httpspushurl;
 
 our $cache_grpshared = 1;
 
-- 
2.11.4.GIT