From 45abe880e0efbdc3834168f4fd384678e1c30a51 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 24 Aug 2018 21:31:49 +0100 Subject: git-debrebase: forget-was-ever-debrebase: New subcommand Signed-off-by: Ian Jackson --- git-debrebase | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'git-debrebase') diff --git a/git-debrebase b/git-debrebase index 5fabfd6..c353111 100755 --- a/git-debrebase +++ b/git-debrebase @@ -2838,6 +2838,18 @@ END 'convert-from-dgit-view'; } +sub cmd_forget_was_ever_debrebase () { + badusage "forget-was-ever-debrebase takes no further arguments" if @ARGV; + my ($ffqstatus, $ffq_msg, $current, $ffq_prev, $gdrlast) = + ffq_prev_branchinfo(); + fail "Not suitable for recording git-debrebaseness anyway: $ffq_msg" + if defined $ffq_msg; + push @deferred_updates, "delete $ffq_prev"; + push @deferred_updates, "delete $gdrlast"; + snags_maybe_bail(); + run_deferred_updates "forget-was-ever-debrebase"; +} + sub cmd_record_resolved_merge () { badusage "record-resolved-merge takes no further arguments" if @ARGV; # MERGE-TODO needs documentation -- cgit v1.2.3