diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-04-22 22:28:49 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 22:40:13 +0100 |
commit | 8b875c05ff728c9335f692ccc21c5abfe2203d26 (patch) | |
tree | fc7903a6a1cfbadc91974747a9c43096e8ab6f06 /git-debrebase | |
parent | bdeb85eacfd821cad3e1be0bc844dff5671389b7 (diff) |
git-debrebase: Provide and test "conclude"
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-x | git-debrebase | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/git-debrebase b/git-debrebase index 00d2f57..636ff76 100755 --- a/git-debrebase +++ b/git-debrebase @@ -1325,6 +1325,19 @@ sub cmd_quick () { do_stitch 'quick'; } +sub cmd_conclude () { + my ($ffq_prev, $gdrlast, $ffq_prev_commitish) = ffq_prev_info(); + if (!$ffq_prev_commitish) { + fail "No ongoing git-debrebase session." unless $opt_noop_ok; + return; + } + my $dangling_head = get_head(); + + badusage "no arguments allowed" if @ARGV; + do_launder_head 'launder for git-debrebase quick'; + do_stitch 'quick'; +} + sub cmd_convert_from_gbp () { badusage "needs 1 optional argument, the upstream git rev" unless @ARGV<=1; |