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

Even if we were both stitched and laundered.

Closes:#905975.

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

diff --git a/debian/changelog b/debian/changelog
index 9ec8a6f12a2332870ba040c8884e6cac6e370684..5fe69041275c027c09a0cd3cfa8a91fecae9c59f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ dgit (6.7~) unstable; urgency=medium
     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.
     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.

+  * git-debrebase: On rebase, always save ffq-prev even if we were
+    both stitched and laundered.  Closes:#905975.

 
  --
 
 
  --
 

diff --git a/git-debrebase b/git-debrebase
index c273976cc3448885e834b2e9c269778114d6d7dd..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) = @_;
 
 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
     print "git-debrebase: laundered (head was $old)\n";
     update_head $old, $tip, $reflogmsg;
     # no tree changes except debian/patches