From patchwork Mon Jun 17 02:52:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Sangorrin X-Patchwork-Id: 10997817 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B65171575 for ; Mon, 17 Jun 2019 02:52:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9CDF6285A3 for ; Mon, 17 Jun 2019 02:52:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8CF3F2881B; Mon, 17 Jun 2019 02:52:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8722F285A3 for ; Mon, 17 Jun 2019 02:52:22 +0000 (UTC) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 5616F9F0; Mon, 17 Jun 2019 02:52:22 +0000 (UTC) X-Original-To: cip-dev@lists.cip-project.org Delivered-To: cip-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id B0B4D9F0 for ; Mon, 17 Jun 2019 02:52:20 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mo-csw.securemx.jp (mo-csw1514.securemx.jp [210.130.202.153]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 20F9FE6 for ; Mon, 17 Jun 2019 02:52:19 +0000 (UTC) Received: by mo-csw.securemx.jp (mx-mo-csw1514) id x5H2q9fW023311; Mon, 17 Jun 2019 11:52:09 +0900 X-Iguazu-Qid: 34trDEtsqrdm3uYWOZ X-Iguazu-QSIG: v=2; s=0; t=1560739929; q=34trDEtsqrdm3uYWOZ; m=xUQ3AeI6ldYz1pej/2cakdj7vS24u3wyTh1GYUmxm3c= Received: from imx12.toshiba.co.jp (imx12.toshiba.co.jp [61.202.160.132]) by relay.securemx.jp (mx-mr1510) id x5H2q8mU019171; Mon, 17 Jun 2019 11:52:09 +0900 Received: from enc02.toshiba.co.jp ([61.202.160.51]) by imx12.toshiba.co.jp with ESMTP id x5H2q8Jb006850; Mon, 17 Jun 2019 11:52:08 +0900 (JST) Received: from hop101.toshiba.co.jp ([133.199.85.107]) by enc02.toshiba.co.jp with ESMTP id x5H2q7xI011012; Mon, 17 Jun 2019 11:52:07 +0900 From: Daniel Sangorrin To: ben.hutchings@codethink.co.uk Date: Mon, 17 Jun 2019 11:52:06 +0900 X-TSB-HOP: ON Message-Id: <20190617025206.7753-1-daniel.sangorrin@toshiba.co.jp> X-Mailer: git-send-email 2.17.1 Cc: cip-dev@lists.cip-project.org Subject: [cip-dev] [cip-kernel-sec] import_stable: update torvalds remote as well X-BeenThere: cip-dev@lists.cip-project.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: cip-dev-bounces@lists.cip-project.org Errors-To: cip-dev-bounces@lists.cip-project.org X-Virus-Scanned: ClamAV using ClamSMTP Otherwise, the script will not find all the expected tags and fail with a message like: fatal: ambiguous argument 'v5.1..torvalds/master': unknown revision or path not in the working tree Signed-off-by: Daniel Sangorrin --- scripts/import_stable.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/import_stable.py b/scripts/import_stable.py index dff3954..b3261cf 100755 --- a/scripts/import_stable.py +++ b/scripts/import_stable.py @@ -137,8 +137,7 @@ def add_backports(branches, c_b_map, issue_commits, all_backports, def main(git_repo, remotes, debug=False): branches = kernel_sec.branch.get_live_branches() - remote_names = set(branch['git_remote'] for branch in branches - if branch['short_name'] != 'mainline') + remote_names = set(branch['git_remote'] for branch in branches) for remote_name in remote_names: update(git_repo, remotes[remote_name]['git_name'])