From 836cf431f3e7393b088fdf23fe5f3626808623a9 Mon Sep 17 00:00:00 2001
From: "Kyle J. McKay" <mackyle@gmail.com>
Date: Wed, 26 Oct 2016 23:27:47 -0700
Subject: [PATCH] gitweb: pick up updates

* Support for @git_base_mirror_urls
* Support for generic URL hints

Signed-off-by: Kyle J. McKay <mackyle@gmail.com>
---
 git.git                   |  2 +-
 gitweb/gitweb_config.perl | 19 ++++++++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/git.git b/git.git
index 8f06ddf..67230c9 160000
--- a/git.git
+++ b/git.git
@@ -1 +1 @@
-Subproject commit 8f06ddfdc7a1c6589852a575746cba9d2060c99a
+Subproject commit 67230c90047c161c4ddd1a3709a3286b34c4e45e
diff --git a/gitweb/gitweb_config.perl b/gitweb/gitweb_config.perl
index 0e08ac2..9c7606e 100644
--- a/gitweb/gitweb_config.perl
+++ b/gitweb/gitweb_config.perl
@@ -128,12 +128,29 @@ our $favicon = "@{[url_path($Girocco::Config::gitwebfiles)]}/git-favicon.png";
 ## URI of gitweb.js
 our $javascript = "@{[url_path($Girocco::Config::gitwebfiles)]}/gitweb.js";
 
-## list of git base URLs used for URL to fetch project from,
+## URL Hints
+##
+## Any of the urls in @git_base_url_list, @git_base_mirror_urls or
+## @git_base_push_urls may be an array ref instead of a scalar in which
+## case ${}[0] is the url and ${}[1] is an html fragment "hint" to display
+## right after the URL.
+
+## list of git base URLs used for URL for where 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;
 
+## For push projects (a .nofetch file exists OR gitweb.showpush is true)
+## @git_base_url_list entries are shown as "mirror URL" and @git_base_push_urls
+## are shown as "push URL" and @git_base_mirror_urls are ignored.
+## For non-push projects, @git_base_url_list and @git_base_mirror_urls are shown
+## as "mirror URL" and @git_base_push_urls are ignored.
+
+## list of extra git base URLs used for mirrors for where to fetch project from,
+## i.e. full URL is "$git_base_mirror_url/$project"
+our @git_base_mirror_urls = ();
+
 ## 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 = ();
-- 
2.11.4.GIT