From f6f46cd221e35bf80d3b7c24ec4b4d799446399f Mon Sep 17 00:00:00 2001 From: Konstantin Ryabitsev Date: Mon, 17 May 2021 12:04:09 -0400 Subject: Implement partial reroll It has been a common request to support partial series rerolls where someone sends an amended patch as a follow-up to a previous series, e.g.: [PATCH v3 1/3] Patch one [PATCH v3 2/3] Patch two \- Re: [PATCH v3 2/3] Patch two Looks good, but please fix this $small_thing \- [PATCH v4 2/3] Patch two [PATCH v3] Patch three Previously, b4 refused to consider v4 as a complete new series, but now it will properly perform a partial reroll, but only in the cases where such patches are sent as follow-ups to the exact same patch number in the previous series: [PATCH v3->v4 1/3] Patch one [PATCH v4 2/3] Patch two [PATCH v3->v4 3/3] Patch three Reported-by: Dan Williams Signed-off-by: Konstantin Ryabitsev Link: https://lore.kernel.org/r/CAPcyv4ggbuHbqKV33_TpE7pqxvRag34baJrX3yQe-jXOikoATQ@mail.gmail.com --- b4/command.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'b4/command.py') diff --git a/b4/command.py b/b4/command.py index 12c7354..5a9d6eb 100644 --- a/b4/command.py +++ b/b4/command.py @@ -118,6 +118,8 @@ def cmd(): help='Copy all Cc\'d addresses into Cc: trailers') sp_am.add_argument('--no-cover', dest='nocover', action='store_true', default=False, help='Do not save the cover letter (on by default when using -o -)') + sp_am.add_argument('--no-partial-reroll', dest='nopartialreroll', action='store_true', default=False, + help='Do not reroll partial series when detected') sp_am.set_defaults(func=cmd_am) # b4 attest @@ -129,7 +131,7 @@ def cmd(): sp_att.add_argument('-o', '--output', default=None, help='OBSOLETE: this option does nothing and will be removed') sp_att.add_argument('-m', '--mutt-filter', default=None, - help='OBSOLETE: this option does nothign and will be removed') + help='OBSOLETE: this option does nothing and will be removed') sp_att.add_argument('patchfile', nargs='*', help='Patches to attest') sp_att.set_defaults(func=cmd_attest) -- cgit v1.2.3