From: Eric Sunshine <sunshine@sunshineco.com>
To: "Célestin Matte" <celestin.matte@ensimag.fr>
Cc: Git List <git@vger.kernel.org>,
benoit.person@ensimag.fr,
Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Subject: Re: [PATCH] git-remote-mediawiki: Fix a bug in a regexp
Date: Sun, 9 Jun 2013 01:11:45 -0400 [thread overview]
Message-ID: <CAPig+cQ4Juwz0TOGzQjhGRZn8JofiYUG9xT9kJhoj5Z6yAMoGw@mail.gmail.com> (raw)
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.
prev parent reply other threads:[~2013-06-09 5:12 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-08 13:35 [PATCH] git-remote-mediawiki: Fix a bug in a regexp Célestin Matte
2013-06-08 18:38 ` Matthieu Moy
2013-06-08 20:08 ` Célestin Matte
2013-06-09 2:57 ` Jeff King
2013-06-09 5:21 ` Eric Sunshine
2013-06-09 5:11 ` Eric Sunshine [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAPig+cQ4Juwz0TOGzQjhGRZn8JofiYUG9xT9kJhoj5Z6yAMoGw@mail.gmail.com \
--to=sunshine@sunshineco.com \
--cc=benoit.person@ensimag.fr \
--cc=celestin.matte@ensimag.fr \
--cc=git@vger.kernel.org \
--cc=matthieu.moy@grenoble-inp.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).