git-debrebase: Provide "prepush"

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/git-debrebase b/git-debrebase
index 636ff765cae06141f024e13b7eed023b6851a32c..46ea06af925394634e08eab9a16af02e215709fa 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -1318,6 +1318,7 @@ sub cmd_stitch () {
     badusage "no arguments allowed" if @ARGV;
     do_stitch($prose);
 }
     badusage "no arguments allowed" if @ARGV;
     do_stitch($prose);
 }

+sub cmd_prepush () { cmd_stitch(); }

 
 sub cmd_quick () {
     badusage "no arguments allowed" if @ARGV;
 
 sub cmd_quick () {
     badusage "no arguments allowed" if @ARGV;

diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod
index 3e4c69845598fb59e97b0d489bdcb4d33e559004..73251706a73c1036ee8a00a87ea43db4bb2da11b 100644 (file)
--- 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.
 
 
 If the branch is already laundered and stitched, does nothing.
 

+=item git-debrebase prepush [--prose=<for commit message>]
+

 =item git-debrebase stitch [--prose=<for commit message>]
 
 Stitches the branch,
 consuming ffq-prev.
 =item git-debrebase stitch [--prose=<for commit message>]
 
 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.
 
 
 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 f6d817d88eb3a37b367c411a39ac709e1df113f0..371ad3425252ecdc1d05958a91ad04c0c690329e 100755 (executable)
--- 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 ''              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
 subcmd quick           ns      Sl      Sltf    Sl
 subcmd conclude        "$Ec"   "$Ec"   Sltf    Sl
 #subcmd        make-patches    sPft    sPft    uPft    uPft