All of lore.kernel.org
 help / color / mirror / Atom feed
From: daniel.sangorrin@toshiba.co.jp (Daniel Sangorrin)
To: cip-dev@lists.cip-project.org
Subject: [cip-dev] [cip-kernel-sec] import_stable: update torvalds remote as well
Date: Mon, 17 Jun 2019 11:52:06 +0900	[thread overview]
Message-ID: <20190617025206.7753-1-daniel.sangorrin@toshiba.co.jp> (raw)

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 <daniel.sangorrin@toshiba.co.jp>
---
 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'])
-- 
2.17.1

             reply	other threads:[~2019-06-17  2:52 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-17  2:52 Daniel Sangorrin [this message]
2019-06-17 20:22 ` [cip-dev] [cip-kernel-sec] import_stable: update torvalds remote as well Ben Hutchings

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=20190617025206.7753-1-daniel.sangorrin@toshiba.co.jp \
    --to=daniel.sangorrin@toshiba.co.jp \
    --cc=cip-dev@lists.cip-project.org \
    /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.