* [cip-dev] [cip-kernel-sec] import_stable: update torvalds remote as well
@ 2019-06-17 2:52 Daniel Sangorrin
2019-06-17 20:22 ` Ben Hutchings
0 siblings, 1 reply; 2+ messages in thread
From: Daniel Sangorrin @ 2019-06-17 2:52 UTC (permalink / raw)
To: cip-dev
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [cip-dev] [cip-kernel-sec] import_stable: update torvalds remote as well
2019-06-17 2:52 [cip-dev] [cip-kernel-sec] import_stable: update torvalds remote as well Daniel Sangorrin
@ 2019-06-17 20:22 ` Ben Hutchings
0 siblings, 0 replies; 2+ messages in thread
From: Ben Hutchings @ 2019-06-17 20:22 UTC (permalink / raw)
To: cip-dev
On Mon, 2019-06-17 at 11:52 +0900, Daniel Sangorrin wrote:
> 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>
[...]
Applied, thanks.
Ben.
--
Ben Hutchings, Software Developer ? Codethink Ltd
https://www.codethink.co.uk/ Dale House, 35 Dale Street
Manchester, M1 2HF, United Kingdom
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-06-17 20:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-17 2:52 [cip-dev] [cip-kernel-sec] import_stable: update torvalds remote as well Daniel Sangorrin
2019-06-17 20:22 ` Ben Hutchings
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.