From c7244a622fedfc203a935692a6f9e54733494dfc Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 31 Jan 2018 15:31:02 +0000 Subject: [PATCH] git-debrebase: break out update_head_postlaunder (nfc) Signed-off-by: Ian Jackson --- git-debrebase | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/git-debrebase b/git-debrebase index 931a0124..c89e598f 100755 --- a/git-debrebase +++ b/git-debrebase @@ -785,13 +785,18 @@ sub update_head_checkout ($$$) { update_head $old, $new, $mrest; } +sub update_head_postlaunder ($$$) { + my ($old, $tip, $reflogmsg) = @_; + update_head $old, $tip, $reflogmsg; + # no tree changes except debian/patches + runcmd @git, qw(rm --quiet --ignore-unmatch -rf debian/patches); +} + sub cmd_launder () { badusage "no arguments to launder allowed" if @ARGV; my $old = get_head(); my ($tip,$breakwater,$last_upstream_merge) = walk $old; - update_head $old, $tip, 'launder'; - # no tree changes except debian/patches - runcmd @git, qw(rm --quiet --ignore-unmatch -rf debian/patches); + update_head_postlaunder $old, $tip, 'launder'; printf "# breakwater tip\n%s\n", $breakwater; printf "# working tip\n%s\n", $tip; printf "# last upstream merge\n%s\n", $last_upstream_merge; -- 2.30.2