File tree 2 files changed +9
-14
lines changed
2 files changed +9
-14
lines changed Original file line number Diff line number Diff line change @@ -46,7 +46,9 @@ Clone the RISC-V trees::
46
46
$ mkdir trees
47
47
$ git clone https://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git
48
48
$ cd linux
49
- $ git worktree add ../fixes -b fixes origin/fixes
49
+ $ git remote add next https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
50
+ $ git fetch next
51
+ $ git worktree add ../fixes -b fixes next/pending-fixes
50
52
$ git worktree add ../for-next -b for-next origin/for-next
51
53
52
54
A corresponding config file for the above would be::
@@ -62,7 +64,7 @@ A corresponding config file for the above would be::
62
64
63
65
[trees]
64
66
for-next = for-next,for-next,origin,origin/for-next
65
- fixes = fixes,fixes,origin,origin/ fixes
67
+ fixes = fixes,fixes,next,next/pending- fixes
66
68
67
69
Tests
68
70
=====
Original file line number Diff line number Diff line change 21
21
from pw import Patchwork
22
22
from pw import PwSeries
23
23
import core
24
- import re
24
+ import netdev
25
25
26
26
27
27
class IncompleteSeries (Exception ):
@@ -103,17 +103,10 @@ def _series_determine_tree(self, s: PwSeries) -> str:
103
103
s .tree_name = 'for-next'
104
104
return f"Pull request for { s .tree_name } "
105
105
106
- # If there's a Fixes: tag, assume the fixes tree
107
- commits = []
108
- regex = re .compile (r'^Fixes: [a-f0-9]* \(' )
109
- for p in s .patches :
110
- commits += regex .findall (p .raw_patch )
111
- if commits :
112
- s .tree_name = 'fixes'
113
- else :
114
- s .tree_name = 'for-next'
115
-
116
- # XXX fallback to something else?
106
+ if "fixes" in self ._trees and netdev .series_is_a_fix_for (s , self ._trees ["fixes" ]):
107
+ s .tree_name = "fixes"
108
+ elif "for-next" in self ._trees and self ._trees ["for-next" ].check_applies (s ):
109
+ s .tree_name = "for-next"
117
110
118
111
if s .tree_name :
119
112
log (f"Target tree - { s .tree_name } " , "" )
You can’t perform that action at this time.
0 commit comments