diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-02-15 20:17:12 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 12:25:49 +0100 |
commit | 0943c19e7dcccf0ac05fb266b232a9c36781264e (patch) | |
tree | 9a44e3d72bd6600612a01963f88d31e56b1daae4 | |
parent | a865af47e6e6dc6160812fa0cdfbcb4d57f38723 (diff) |
git-debrebase: record ffq-prev on rebase
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rw-r--r-- | NOTES.git-debrebase | 1 | ||||
-rwxr-xr-x | git-debrebase | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/NOTES.git-debrebase b/NOTES.git-debrebase index 8aed2ff..32f9b49 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 592dd29..19beef8 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; |