From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 15 Jul 2010 19:04:32 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.2~29
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/c255a70b5ef4e70070b6076c4308da9d163d56a9?hp=fc051572a3fe171286f10761bd33946c48de3f7f

Merge branch 'maint'

* maint:
Documentation: add submodule.* to the big configuration variable list
gitmodules.5: url can be a relative path
gitweb: fix esc_url
---

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 79d54e546a..e75434b3ef 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1734,6 +1734,15 @@ status.submodulesummary::
 	summary of commits for modified submodules will be shown (see
 	--summary-limit option of linkgit:git-submodule[1]).
 
+submodule.<name>.path::
+submodule.<name>.url::
+submodule.<name>.update::
+	The path within this project, URL, and the updating strategy
+	for a submodule.  These variables are initially populated
+	by 'git submodule init'; edit them to override the
+	URL and other values found in the `.gitmodules` file.  See
+	linkgit:git-submodule[1] and linkgit:gitmodules[5] for details.
+
 tar.umask::
 	This variable can be used to restrict the permission bits of
 	tar archive entries.  The default is 0002, which turns off the
diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt
index 5daf750d19..72a13d18e0 100644
--- a/Documentation/gitmodules.txt
+++ b/Documentation/gitmodules.txt
@@ -29,6 +29,9 @@ submodule.<name>.path::
 
 submodule.<name>.url::
 	Defines an url from where the submodule repository can be cloned.
+	This may be either an absolute URL ready to be passed to
+	linkgit:git-clone[1] or (if it begins with ./ or ../) a location
+	relative to the superproject's origin repository.
 
 submodule.<name>.update::
 	Defines what to do when the submodule is updated by the superproject.
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 1f611d22d4..cedc357313 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -1327,8 +1327,7 @@ sub esc_param {
 sub esc_url {
 	my $str = shift;
 	return undef unless defined $str;
-	$str =~ s/([^A-Za-z0-9\-_.~();\/;?:@&=])/sprintf("%%%02X", ord($1))/eg;
-	$str =~ s/\+/%2B/g;
+	$str =~ s/([^A-Za-z0-9\-_.~();\/;?:@&= ]+)/CGI::escape($1)/eg;
 	$str =~ s/ /\+/g;
 	return $str;
 }