From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 15 Feb 2018 20:17:12 +0000 (+0000)
Subject: git-debrebase: record ffq-prev on rebase
X-Git-Tag: archive/debian/5.0~220
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=0943c19e7dcccf0ac05fb266b232a9c36781264e;ds=sidebyside

git-debrebase: record ffq-prev on rebase

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

diff --git a/NOTES.git-debrebase b/NOTES.git-debrebase
index 8aed2ff2..32f9b494 100644
--- a/NOTES.git-debrebase
+++ b/NOTES.git-debrebase
@@ -42,6 +42,7 @@ overall format
 
 [git-debrebase: gbp2debrebase, drop patches]
 [git-debrebase breakwater: declare upstream]
+[git-debrebase pseudomerge: stitch]
 
 m{^\[git-debrebase (?:\w*-)?upstream combine \.((?: $extra_orig_namepart_re)+)\]}
 
diff --git a/git-debrebase b/git-debrebase
index 592dd292..19beef8c 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -832,6 +832,12 @@ sub cmd_launder () {
 
 sub defaultcmd_rebase () {
     my $old = get_head();
+    my ($status, $message) = record_ffq_prev();
+    if ($status eq 'written' || $status eq 'exists') {
+    } else {
+	fproblem $status, "could not record ffq-prev: $message";
+	fproblems_maybe_bail();
+    }
     my ($tip,$breakwater) = walk $old;
     update_head_postlaunder $old, $tip, 'launder for rebase';
     runcmd @git, qw(rebase), @ARGV, $breakwater;