Matthieu Moy <Matthieu.Moy@xxxxxxx> writes: > Git-mediawiki's "dumb push" sends the local revisions to the remote wiki, > but does not update the local metadata to reflect the push (hence, the > next pull will have to re-import the exported revisions). > > The previous implementation was simply omitting the update to the private > ref after a dumb push. This was broken by 664059fb62 (Felipe Contreras, > Apr 17 2013, transport-helper: update remote helper namespace), which > does an automatic update of the private ref (not just the > remote-tracking) on push. > > This patch fixes git-remote-mediawiki to reset the private ref after the > push is completed, cancelling the automatic update triggered by > 664059fb62. > > Signed-off-by: Matthieu Moy <Matthieu.Moy@xxxxxxx> > --- > Just a resend of the RFC > ( http://thread.gmane.org/gmane.comp.version-control.git/232224 ), > which received no comment. > > contrib/mw-to-git/git-remote-mediawiki.perl | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > 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... > return 0; > } > if ($cmd[0] eq 'capabilities') { > @@ -1209,9 +1213,10 @@ sub mw_push_revision { > die("Unknown error from mw_push_file()\n"); > } > } > - if (!$dumb_push) { > + if ($dumb_push) { > + $reset_private_ref_to = $remoteorigin_sha1; ... it is set for dumb-push? I am confused. > + } else { > run_git(qq(notes --ref=${remotename}/mediawiki add -f -m "mediawiki_revision: ${mw_revision}" ${sha1_commit})); > - run_git(qq(update-ref -m "Git-MediaWiki push" refs/mediawiki/${remotename}/master ${sha1_commit} ${sha1_child})); > } > } -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html