git-debrebase: `prepush' is now a silent no-op if unstitched.

This is more friendly.  Update the docs accordingly.

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

diff --git a/debian/changelog b/debian/changelog
index e9a36a2972894027fcf3ebaa73bd6a1c220c10b3..9ec8a6f12a2332870ba040c8884e6cac6e370684 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ dgit (6.7~) unstable; urgency=medium
   * test suite: unset GIT_EDITOR, so it works if user has that set.
   * git-debrebase: Improve laundry performance by a factor of ~55:1,
     and analysis performance by factor of ~4.2:1.  Closes:#905995.
+  * git-debrebase: `prepush' is now a silent no-op if the branch is
+    unstitched.  This is more friendly.
 
  --
 

diff --git a/git-debrebase b/git-debrebase
index 61507ea27ba6470f5b39b3c9583e8fd4c6984fdd..c273976cc3448885e834b2e9c269778114d6d7dd 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -2275,7 +2275,10 @@ sub cmd_stitch () {
     badusage "no arguments allowed" if @ARGV;
     do_stitch $prose, 0;
 }
-sub cmd_prepush () { cmd_stitch(); }
+sub cmd_prepush () {
+    $opt_noop_ok = 1;
+    cmd_stitch();
+}
 
 sub cmd_quick () {
     badusage "no arguments allowed" if @ARGV;

diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod
index fe65674735838fa3fe67566a5edf62e6550170bc..ca81c19780a531e5c88215bbbab6f770c61e9560 100644 (file)
--- a/git-debrebase.1.pod
+++ b/git-debrebase.1.pod
@@ -95,16 +95,22 @@ If the branch is already laundered and stitched, does nothing.
 
 =item git-debrebase prepush [--prose=<for commit message>]
 
+If the branch is unstitched,
+stitches it,
+consuming ffq-prev.
+
+This is a good command to run before pushing to a git server.
+You should consider using B<conclude> instead,
+because that launders the branch too.
+
 =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.
 
-You should consider using B<conclude> instead,
-because that launders the branch too.
+You should consider using B<prepush> or B<conclude> instead.
 
 =item git-debrebase scrap
 

diff --git a/tests/tests/gdr-subcommands b/tests/tests/gdr-subcommands
index b4d8f4414968c3b4588b2d6217cfa9974cade318..e94f83e308765a878b45d444245377e8196830f0 100755 (executable)
--- a/tests/tests/gdr-subcommands
+++ b/tests/tests/gdr-subcommands
@@ -200,7 +200,7 @@ Ep="F:Patch export produced patch amendments"
 #
 subcmd ''              Ult     Ull     Vlt     Vl
 subcmd stitch          Ns      Nu      Sltf    Stf
-subcmd prepush         Ns      Nu      Sltf    Stf
+subcmd prepush         ns      nu      Sltf    Stf
 subcmd quick           ns      Sl      Sltf    Sl
 subcmd conclude        "$Ec"   "$Ec"   Sltf    Sl
 subcmd scrap           Ns      Ns      Z       Z