commit | 96653ce3041e87f71a8dbbcfd4cb80424758c8fd | [log] [tgz] |
---|---|---|
author | Simon Legner <Simon.Legner@gmail.com> | Mon Sep 21 12:39:55 2020 +0200 |
committer | Junio C Hamano <gitster@pobox.com> | Mon Sep 21 12:37:38 2020 -0700 |
tree | 63d706642e39fd80ed043c28bbb1ce364a6cc5b2 | |
parent | 1d42b4d01c95cae37e9c0ebe0ed7c9418f2d6c25 [diff] |
remote-mediawiki: fix duplicate revisions being imported Fix a bug with revisions being imported twice. This commit is being backported from Git-Mediawiki.git's e41ee9b ("All revisions imported twice", 2018-02-02) to git.git. See [1] for the original commit and [2] and [3] for the upstream PR and issue. 1. https://github.com/Git-Mediawiki/Git-Mediawiki/commit/e41ee9b3a32416df381cdc79f63350665c84151e 2. https://github.com/Git-Mediawiki/Git-Mediawiki/pull/61 3. https://github.com/Git-Mediawiki/Git-Mediawiki/issues/29 Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl index 08190e2..26d5e1a 100755 --- a/contrib/mw-to-git/git-remote-mediawiki.perl +++ b/contrib/mw-to-git/git-remote-mediawiki.perl
@@ -807,7 +807,10 @@ sub mw_import { # multiple import commands can follow each other. my @refs = (shift, get_more_refs('import')); + my $processedRefs; foreach my $ref (@refs) { + next if $processedRefs->{$ref}; # skip duplicates: "import refs/heads/master" being issued twice; TODO: why? + $processedRefs->{$ref} = 1; mw_import_ref($ref); } print {*STDOUT} "done\n";