summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-26 23:16:31 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-10-26 23:16:31 (GMT)
commit2ef89f38568c9bfa663a8c79354e6d2135fb6bf3 (patch)
treed227093caad0cb8e54171cda1c572b8afb68b7e0
parent3b6a5d2d05d4945e11fbc3669a82f81ce18f80a4 (diff)
parent9fb79503e683c1bff810a78a47c939708af5f6b7 (diff)
downloadgit-2ef89f38568c9bfa663a8c79354e6d2135fb6bf3.zip
git-2ef89f38568c9bfa663a8c79354e6d2135fb6bf3.tar.gz
git-2ef89f38568c9bfa663a8c79354e6d2135fb6bf3.tar.bz2
Merge branch 'mm/mediawiki-author-fix'
* mm/mediawiki-author-fix: git-remote-mediawiki: don't include HTTP login/password in author
-rwxr-xr-xcontrib/mw-to-git/git-remote-mediawiki4
1 files changed, 4 insertions, 0 deletions
diff --git a/contrib/mw-to-git/git-remote-mediawiki b/contrib/mw-to-git/git-remote-mediawiki
index 0b32d18..c18bfa1 100755
--- a/contrib/mw-to-git/git-remote-mediawiki
+++ b/contrib/mw-to-git/git-remote-mediawiki
@@ -109,6 +109,10 @@ $dumb_push = ($dumb_push eq "true");
my $wiki_name = $url;
$wiki_name =~ s/[^\/]*:\/\///;
+# If URL is like http://user:password@example.com/, we clearly don't
+# want the password in $wiki_name. While we're there, also remove user
+# and '@' sign, to avoid author like MWUser@HTTPUser@host.com
+$wiki_name =~ s/^.*@//;
# Commands parser
my $entry;