From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 29 Mar 2018 18:48:04 +0000 (+0100)
Subject: git-debrebase: Break out do_launder_head (nfc)
X-Git-Tag: archive/debian/5.0~80
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=9bab0fa49d1ed2d47a3a02ab9c4db1d721b8752e

git-debrebase: Break out do_launder_head (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/git-debrebase b/git-debrebase
index 17132467..866b0ded 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;
 }