diff options
| author | Konstantin Ryabitsev <konstantin@linuxfoundation.org> | 2020-04-03 17:49:48 -0400 |
|---|---|---|
| committer | Konstantin Ryabitsev <konstantin@linuxfoundation.org> | 2020-04-03 17:49:48 -0400 |
| commit | 92cfcd77d276f7cf566220c69376675f590491fe (patch) | |
| tree | ae6b18044a79319669b6ff4bf3764e346f7bf187 | |
| parent | 47bec119bedea0d283ded3d4ee29f19f3939ff4d (diff) | |
| download | b4-92cfcd77d276f7cf566220c69376675f590491fe.tar.gz | |
Recognize when reroll info is only in 1st patch
Sometimes this happens:
[PATCH v2 1/N]
[PATCH 2/N]
[PATCH 3/N]
[PATCH 4/N]
Properly recognize such cases and version all patches threaded under the
first one as v2.
Reported-by: Amit Kucheria <amit.kucheria@gmail.com>
Signed-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
| -rw-r--r-- | b4/__init__.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/b4/__init__.py b/b4/__init__.py index ca1bf60..1de513b 100644 --- a/b4/__init__.py +++ b/b4/__init__.py @@ -269,6 +269,10 @@ class LoreMailbox: # Yes, this is very likely our cover letter logger.debug(' fixed revision to v%s', irt.revision) lmsg.revision = irt.revision + # alternatively, see if upthread is patch 1 + elif lmsg.counter > 0 and irt is not None and irt.has_diff and irt.counter == 1: + logger.debug(' fixed revision to v%s', irt.revision) + lmsg.revision = irt.revision # Run our check again if lmsg.revision not in self.series: |