From b5bf8a0f318806562b3089ce8a84d864ee2b3f0f Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 22 Apr 2018 22:35:58 +0100 Subject: [PATCH 1/1] git-debrebase: Provide "prepush" Signed-off-by: Ian Jackson --- git-debrebase | 1 + git-debrebase.1.pod | 3 +++ tests/tests/gdr-subcommands | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/git-debrebase b/git-debrebase index 636ff765..46ea06af 100755 --- a/git-debrebase +++ b/git-debrebase @@ -1318,6 +1318,7 @@ sub cmd_stitch () { badusage "no arguments allowed" if @ARGV; do_stitch($prose); } +sub cmd_prepush () { cmd_stitch(); } sub cmd_quick () { badusage "no arguments allowed" if @ARGV; diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index 3e4c6984..73251706 100644 --- a/git-debrebase.1.pod +++ b/git-debrebase.1.pod @@ -74,10 +74,13 @@ and making a new pseudomerge. If the branch is already laundered and stitched, does nothing. +=item git-debrebase prepush [--prose=] + =item git-debrebase stitch [--prose=] Stitches the branch, consuming ffq-prev. +This is a good command to run before pushing to a git server. If there is no ffq-prev, it is an error, unless --noop-ok. diff --git a/tests/tests/gdr-subcommands b/tests/tests/gdr-subcommands index f6d817d8..371ad342 100755 --- a/tests/tests/gdr-subcommands +++ b/tests/tests/gdr-subcommands @@ -160,7 +160,7 @@ Ec="F:No ongoing git-debrebase session" # subcmd '' Ult Ull Vlt Vl subcmd stitch Ns Nu Sltf Stf -#subcmd pre-push Ns Nu Sltf Stf +subcmd prepush Ns Nu Sltf Stf subcmd quick ns Sl Sltf Sl subcmd conclude "$Ec" "$Ec" Sltf Sl #subcmd make-patches sPft sPft uPft uPft -- 2.30.2