diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-02-18 14:13:30 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 16:06:59 +0100 |
commit | eab4301d9d4a6c18f92f4dc0fb4fcb3b6b2ff4ae (patch) | |
tree | 3ab365af6ecc0a30a1e825d9b7514900fbdaebb2 | |
parent | 9156ead35a760f394274c4b33e9a8f019e712f6d (diff) |
git-debrebase: introduce record_ffq_auto (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-x | git-debrebase | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/git-debrebase b/git-debrebase index dbbf51b..902d8a8 100755 --- a/git-debrebase +++ b/git-debrebase @@ -893,12 +893,7 @@ sub cmd_launder_v0 () { sub defaultcmd_rebase () { my $old = get_head(); - my ($status, $message) = record_ffq_prev_deferred(); - if ($status eq 'deferred' || $status eq 'exists') { - } else { - fproblem $status, "could not record ffq-prev: $message"; - fproblems_maybe_bail(); - } + record_ffq_auto(); my ($tip,$breakwater) = walk $old; update_head_postlaunder $old, $tip, 'launder for rebase'; runcmd @git, qw(rebase), @ARGV, $breakwater; @@ -1015,6 +1010,15 @@ sub record_ffq_prev_deferred () { return ('deferred', undef); } +sub record_ffq_auto () { + my ($status, $message) = record_ffq_prev_deferred(); + if ($status eq 'deferred' || $status eq 'exists') { + } else { + fproblem $status, "could not record ffq-prev: $message"; + fproblems_maybe_bail(); + } +} + sub cmd_new_upstream_v0 () { # automatically and unconditionally launders before rebasing # if rebase --abort is used, laundering has still been done |