diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2020-11-06 09:31:45 -0800 |
|---|---|---|
| committer | Daniel Borkmann <daniel@iogearbox.net> | 2020-11-09 22:02:31 +0100 |
| commit | 93f47736bc5ff29a31ce362e35917804f415bd69 (patch) | |
| tree | 14dbc5694240d8bf9833a274ea30448d475ce9dd | |
| parent | c05013d15f20ce44e98ddf8b2cba0762c731c6c7 (diff) | |
| download | pw-93f47736bc5ff29a31ce362e35917804f415bd69.tar.gz | |
pw-pull: rename to pw-request-pull
Follow git command names and make space for a pw-pull command
which would do pulling, rather than generate a PR.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | README | 17 | ||||
| -rwxr-xr-x | pw-request-pull (renamed from pw-pull) | 2 |
3 files changed, 15 insertions, 14 deletions
@@ -1,8 +1,8 @@ install: - cp pw-apply /usr/bin/pw-apply - cp pw-check /usr/bin/pw-check - cp pw-pull /usr/bin/pw-pull - cp pw-backport /usr/bin/pw-backport + cp pw-apply /usr/bin/pw-apply + cp pw-check /usr/bin/pw-check + cp pw-request-pull /usr/bin/pw-request-pull + cp pw-backport /usr/bin/pw-backport uninstall: - $(RM) /usr/bin/pw-apply /usr/bin/pw-pull /usr/bin/pw-check /usr/bin/pw-backport + $(RM) /usr/bin/pw-apply /usr/bin/pw-request-pull /usr/bin/pw-check /usr/bin/pw-backport @@ -70,9 +70,10 @@ for letting it run in the background automatically. Patch handling: --------------- -Main tools are pw-apply and pw-pull, both minimal, quick and dirty scripts -to get the job done. pw-check is called from pw-apply. pw-backport for the -backports to the stable tree. Patches for improving them are very welcome. +Main tools are pw-apply and pw-request-pull, both minimal, quick and dirty +scripts to get the job done. pw-check is called from pw-apply. pw-backport +for the backports to the stable tree. Patches for improving them are very +welcome. 1. Initial patch triage: ~~~~~~~~~~~~~~~~~~~~~~~~ @@ -163,17 +164,17 @@ preference is to explicitly state it here as both {bpf,bpf-next} trees don't have too many commits piling up. Again, this workflow is mostly bpf specific and the scripts would need to be adapted for other subsystems. - $ pw-pull -t bpf -s aef70a1f44c0b570e6345c02c2d240471859f0a4 + $ pw-request-pull -t bpf -s aef70a1f44c0b570e6345c02c2d240471859f0a4 PR: pr-bpf-2019-09-26.patch Currently the -t option only accepts: bpf, bpf-next -The -s option is optional and if not specified then pw-pull will determine -the merge base automatically. In order for this to work, it requires that -there is a net (for -t bpf) or net-next (for -t bpf-next) remote in the +The -s option is optional and if not specified then pw-request-pull will +determine the merge base automatically. In order for this to work, it requires +that there is a net (for -t bpf) or net-next (for -t bpf-next) remote in the repository. To generate the PR, simply do: - $ pw-pull -t bpf + $ pw-request-pull -t bpf PR: pr-bpf-2019-09-26.patch The resulting file is then edited to describe the changes that the pull-request diff --git a/pw-pull b/pw-request-pull index cfb1bcf..5d3557c 100755 --- a/pw-pull +++ b/pw-request-pull @@ -6,7 +6,7 @@ usage() { cat <<-EOF - usage: pw-pull [-h] [-t TREE] [-s SINCE_COMMIT] + usage: pw-request-pull [-h] [-t TREE] [-s SINCE_COMMIT] EOF exit } |