From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 19 Aug 2018 17:45:51 +0000 (+0100)
Subject: git-debrebase: On rebase, always save ffq-prev
X-Git-Tag: archive/debian/6.7~44
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=96768306c386add902ee7a8b733225e9d811b971;p=dgit.git

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 9ec8a6f1..5fe69041 100644
--- 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.
+  * 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 c273976c..894bad5d 100755
--- 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