From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_PASS, SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 5A6091F4B4 for ; Mon, 21 Sep 2020 10:40:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726669AbgIUKkn (ORCPT ); Mon, 21 Sep 2020 06:40:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34050 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726828AbgIUKka (ORCPT ); Mon, 21 Sep 2020 06:40:30 -0400 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C6067C0613CF for ; Mon, 21 Sep 2020 03:40:29 -0700 (PDT) Received: by mail-wr1-x442.google.com with SMTP id a17so12173363wrn.6 for ; Mon, 21 Sep 2020 03:40:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZUGgYiXbI+kwOXhbioUSqfAvb5eTbe245oPLj6OI7V8=; b=TbtN1bK3/YLXlighyvj8Dr3zpaXxyv6XFG/KfqxAR9uDpq7gaRjiDwVckLrb0l/umZ lXHwkJv5m6XGZCqWfoRiZzcQ0GjvS++szBOPdafmQLKjmgbUz0BCUis2VtxCG68hmJGb +5KgHhbZkxNO5pIYXj0FxQYc1ZmARTv3XeFV8z9XENcgKVUBwB6xpMSoqwiBn7TpSbjt m2UGExUFUDJ688egVoAsy8ztjAnC2Fe5JWOHvMqvFabBf2W6r6YxflnNRu1xQ4buJhma PI9yKAeE90qMvki6Zvg37RwgvoOfzBQfuagCkIxr+gQzuPlte0M/2L6WLNNqske5YOhw 6t2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZUGgYiXbI+kwOXhbioUSqfAvb5eTbe245oPLj6OI7V8=; b=GGO1Nfi3Y4d3c3y1+4yQhDA58nyYy4T8TmyDHSOV+QJVhztYPypcAgTeMfkGdpPT8J 4wfDsBPpn5lY1hWpkshBHG+E7lNvySyqhJWzocOmHajMVbV2TT5IxWqPAjqZzdpGZowt tHWqYdU+AImg8wOH2tfDaUrdakQij7BVd1hJZZ1cQWy8HzHUNxEHVhGs0ppNi996mFz+ Rqamaxbi1L7p8YZOeHNOsZzlWY2s+OsJkbQuvYzgLCtTuWlOiCFx3WBXPOQIAG8IArv7 28TJkiCUXYtDKd2Zcuird7qknI/aUUO/GkHJZK5m14kK5gneYypxxmxd9yZsHcrvE3XM Fxqg== X-Gm-Message-State: AOAM531rSaqW3NRe910fjkH+T1HMcTfM0kVSJIMfdf7kw4X0xaOfd0nx pUF4eqyGJe3alVK87iwMD+brDrruRSo1tA== X-Google-Smtp-Source: ABdhPJwxTbvJzMqV7pVpWrcR30r9/sBn+lRmlkDDSkefTGKL/kojFCoGu5HHOCm9OWWMmuPCTR7G8Q== X-Received: by 2002:adf:d0cb:: with SMTP id z11mr49931538wrh.192.1600684828264; Mon, 21 Sep 2020 03:40:28 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id 9sm18647833wmf.7.2020.09.21.03.40.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Sep 2020 03:40:27 -0700 (PDT) From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= To: git@vger.kernel.org Cc: Junio C Hamano , Matthieu Moy , Johannes Schindelin , =?UTF-8?q?Antoine=20Beaupr=C3=A9?= , =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= , imon Legner , Eric Sunshine , Jeff King , =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Subject: [PATCH v2 13/18] remote-mediawiki: fix duplicate revisions being imported Date: Mon, 21 Sep 2020 12:39:55 +0200 Message-Id: <20200921104000.2304-14-avarab@gmail.com> X-Mailer: git-send-email 2.28.0.297.g1956fa8f8d In-Reply-To: <20200916102918.29805-1-avarab@gmail.com> References: <20200916102918.29805-1-avarab@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Simon Legner 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 --- contrib/mw-to-git/git-remote-mediawiki.perl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl index 08190e23e1..26d5e1a174 100755 --- a/contrib/mw-to-git/git-remote-mediawiki.perl +++ b/contrib/mw-to-git/git-remote-mediawiki.perl @@ -807,7 +807,10 @@ sub get_more_refs { 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"; -- 2.28.0.297.g1956fa8f8d