From: Eric Sunshine <sunshine@sunshineco.com>
Date: Sun, 09 Jun 2013 05:11:45 GMT
Subject: Re: [PATCH] git-remote-mediawiki: Fix a bug in a regexp
Message-ID: <CAPig+cQ4Juwz0TOGzQjhGRZn8JofiYUG9xT9kJhoj5Z6yAMoGw@mail.gmail.com>
In-Reply-To: <1370698510-11649-1-git-send-email-celestin.matte@ensimag.fr>

On Sat, Jun 8, 2013 at 9:35 AM, Célestin Matte
<celestin.matte@ensimag.fr> wrote:
> In Perl, '\n' is not a newline, but instead a literal backslash followed by an
> "n". As the output of "rev-list --first-parent" is line-oriented, what we want
> here is a newline.
>
> Signed-off-by: Célestin Matte <celestin.matte@ensimag.fr>
> Signed-off-by: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
> ---
>  contrib/mw-to-git/git-remote-mediawiki.perl |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl
> index 7af202f..a06bc31 100755
> --- a/contrib/mw-to-git/git-remote-mediawiki.perl
> +++ b/contrib/mw-to-git/git-remote-mediawiki.perl
> @@ -1190,7 +1190,7 @@ sub mw_push_revision {
>                 # history (linearized with --first-parent)
>                 print STDERR "Warning: no common ancestor, pushing complete history\n";
>                 my $history = run_git("rev-list --first-parent --children $local");
> -               my @history = split('\n', $history);
> +               my @history = split(/\n/, $history);
>                 @history = @history[1..$#history];
>                 foreach my $line (reverse @history) {
>                         my @commit_info_split = split(/ |\n/, $line);

It would be quite acceptable to include this patch in your existing
patch series.