git-debrebase: On rebase, always save ffq-prev

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index 61507ea27ba6470f5b39b3c9583e8fd4c6984fdd..894bad5d227b8e0adcbb47843ad58af2bd4ac800 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -1672,7 +1672,7 @@ sub update_head_checkout ($$$) {
 
 sub update_head_postlaunder ($$$) {
     my ($old, $tip, $reflogmsg) = @_;
-    return if $tip eq $old;
+    return if $tip eq $old && !@deferred_updates;
     print "git-debrebase: laundered (head was $old)\n";
     update_head $old, $tip, $reflogmsg;
     # no tree changes except debian/patches
@@ -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;