diff options
| author | Daniel Borkmann <daniel@iogearbox.net> | 2019-10-08 22:55:09 +0200 |
|---|---|---|
| committer | Daniel Borkmann <daniel@iogearbox.net> | 2019-10-08 22:55:09 +0200 |
| commit | b8beaed7378561e39896327cf266b8816086ae38 (patch) | |
| tree | 5df86a5539c3282ab972c76cc112cd37cee863ea | |
| parent | 904fe23577194c87a18847a110c16bf5464f1761 (diff) | |
| download | pw-b8beaed7378561e39896327cf266b8816086ae38.tar.gz | |
pw: rename pw-apply mbox option from -m into -b
Given this is rather a fallback option and seldomly used by us, lets
rename -m into -b as we would like to repurpose -m for denoting an
explicit merge commit in pw-apply.
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
| -rw-r--r-- | README | 6 | ||||
| -rwxr-xr-x | pw-apply | 4 |
2 files changed, 5 insertions, 5 deletions
@@ -107,11 +107,11 @@ patches, multiple people separated by comma: The pw-apply tool can also handle mboxes directly compressed in gzip or uncompressed format: - $ pw-apply -m https://patchwork.ozlabs.org/series/132626/mbox/ -- -t 'Joe Hacker <j@hack.er>' + $ pw-apply -b https://patchwork.ozlabs.org/series/132626/mbox/ -- -t 'Joe Hacker <j@hack.er>' Another example without adding optional tags, this time from lore: - $ pw-apply -m https://lore.kernel.org/bpf/20190925203745.3173184-1-andriin@fb.com/t.mbox.gz + $ pw-apply -b https://lore.kernel.org/bpf/20190925203745.3173184-1-andriin@fb.com/t.mbox.gz The pw-apply tool normalizes the patches through mb2q, sorts and groups tags, adds permanent links to the lore list archive and merges them into @@ -124,7 +124,7 @@ anything else: $ pw-apply -s 132626 -a -Note that this does not work in combination with the -m parameter since +Note that this does not work in combination with the -b parameter since the stand-alone mailbox does not have any context of patchwork. Full workflow: @@ -6,7 +6,7 @@ usage() { cat <<-EOF - usage: pw-apply [-h] [-s SERIES] [-m MBOX] [-a] -- [-C] + usage: pw-apply [-h] [-s SERIES] [-b MBOX] [-a] -- [-C] [-a ACKEDBY] [-r REVIEWEDBY] [-t TESTEDBY] EOF exit @@ -47,7 +47,7 @@ while true; do case "$1" in -s | --series ) series="$2"; shift 2 ;; -a | --accept ) accept="1"; shift ;; - -m | --mbox ) mbox="$2"; shift 2 ;; + -b | --mbox ) mbox="$2"; shift 2 ;; -h | --help ) usage; break ;; -- ) shift; break ;; * ) break ;; |