From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 26 Oct 2011 23:16:31 +0000 (-0700)
Subject: Merge branch 'mm/mediawiki-author-fix'
X-Git-Tag: v1.7.8-rc0~11
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2ef89f38568c9bfa663a8c79354e6d2135fb6bf3?hp=3b6a5d2d05d4945e11fbc3669a82f81ce18f80a4

Merge branch 'mm/mediawiki-author-fix'

* mm/mediawiki-author-fix:
git-remote-mediawiki: don't include HTTP login/password in author
---

diff --git a/contrib/mw-to-git/git-remote-mediawiki b/contrib/mw-to-git/git-remote-mediawiki
index 0b32d18eaa..c18bfa1f15 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;