diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-03-29 19:48:04 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 16:07:01 +0100 |
commit | 9bab0fa49d1ed2d47a3a02ab9c4db1d721b8752e (patch) | |
tree | 6fe848368eecf4168ad522f2b724decf957b89fd | |
parent | 5ccc45c714e700c97d52fa291daef03cd2492780 (diff) |
git-debrebase: Break out do_launder_head (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-x | git-debrebase | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/git-debrebase b/git-debrebase index 1713246..866b0de 100755 --- a/git-debrebase +++ b/git-debrebase @@ -885,6 +885,15 @@ sub update_head_postlaunder ($$$) { runcmd @git, qw(rm --quiet --ignore-unmatch -rf debian/patches); } +sub do_launder_head ($) { + my ($reflogmsg) = @_; + my $old = get_head(); + record_ffq_auto(); + my ($tip,$breakwater) = walk $old; + update_head_postlaunder $old, $tip, $reflogmsg; + return ($tip,$breakwater); +} + sub cmd_launder_v0 () { badusage "no arguments to launder-v0 allowed" if @ARGV; my $old = get_head(); @@ -896,10 +905,7 @@ sub cmd_launder_v0 () { } sub defaultcmd_rebase () { - my $old = get_head(); - record_ffq_auto(); - my ($tip,$breakwater) = walk $old; - update_head_postlaunder $old, $tip, 'launder for rebase'; + my ($tip,$breakwater) = do_launder_head 'launder for rebase'; runcmd @git, qw(rebase), @ARGV, $breakwater; } |