All of lore.kernel.org
 help / color / mirror / Atom feed
From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 1/2] git-remote-mediawiki: reset private ref after non-dumb push
Date: Wed, 21 Aug 2013 22:26:17 +0200	[thread overview]
Message-ID: <vpqy57u7pue.fsf@anie.imag.fr> (raw)
In-Reply-To: <xmqq1u5nudq8.fsf@gitster.dls.corp.google.com> (Junio C. Hamano's message of "Wed, 21 Aug 2013 10:59:27 -0700")

Junio C Hamano <gitster@pobox.com> writes:

>> diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl
>> index f8d7d2c..13919ad 100755
>> --- a/contrib/mw-to-git/git-remote-mediawiki.perl
>> +++ b/contrib/mw-to-git/git-remote-mediawiki.perl
>> @@ -53,6 +53,7 @@ if (@ARGV != 2) {
>>  
>>  my $remotename = $ARGV[0];
>>  my $url = $ARGV[1];
>> +my $reset_private_ref_to = undef;
>>  
>>  # Accept both space-separated and multiple keys in config file.
>>  # Spaces should be written as _ anyway because we'll use chomp.
>> @@ -161,6 +162,9 @@ sub parse_command {
>>  	my ($line) = @_;
>>  	my @cmd = split(/ /, $line);
>>  	if (!defined $cmd[0]) {
>> +		if ($reset_private_ref_to) {
>> +			run_git("update-ref -m \"Git-MediaWiki non-dumb push\" refs/mediawiki/$remotename/master $reset_private_ref_to");
>> +		}
>
> So reset-private-ref-to is recorded for a non-dumb push, but...

> ... it is set for dumb-push?  I am confused.

Oops, I'm the one who did the confusion indeed. It should be
s/non-dumb/dumb/ here and in the subject line.

Don't merge this one, I've fixed locally and will resend (this or
another fix, depending on the outcome of the discussion).

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/

      reply	other threads:[~2013-08-21 20:26 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-21  8:10 [PATCH 1/2] git-remote-mediawiki: reset private ref after non-dumb push Matthieu Moy
2013-08-21  8:10 ` [PATCH 2/2] git-remote-mediawiki: add test and check Makefile targets Matthieu Moy
2013-08-21 17:59 ` [PATCH 1/2] git-remote-mediawiki: reset private ref after non-dumb push Junio C Hamano
2013-08-21 20:26   ` Matthieu Moy [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=vpqy57u7pue.fsf@anie.imag.fr \
    --to=matthieu.moy@grenoble-inp.fr \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.