summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xgit-debrebase14
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;
}