diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-04-22 22:43:56 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 22:40:13 +0100 |
commit | 6d23729c4dd314393f3e9596d4dcdd106cee4a11 (patch) | |
tree | f0e9b07c5b14075811313d7e05f69a97122e7bc2 /git-debrebase | |
parent | b5bf8a0f318806562b3089ce8a84d864ee2b3f0f (diff) |
git-debrebase: do_stitch: Introduce $unclean argument
Update all call sites. No functional change just yet.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-x | git-debrebase | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/git-debrebase b/git-debrebase index 46ea06a..5aaa660 100755 --- a/git-debrebase +++ b/git-debrebase @@ -1083,8 +1083,8 @@ sub stitch ($$$$$) { update_head $old_head, $new_head, "stitch: $prose"; } -sub do_stitch ($) { - my ($prose) = @_; +sub do_stitch ($;$) { + my ($prose, $unclean) = @_; my ($ffq_prev, $gdrlast, $ffq_prev_commitish) = ffq_prev_info(); if (!$ffq_prev_commitish) { @@ -1093,7 +1093,7 @@ sub do_stitch ($) { } my $dangling_head = get_head(); - keycommits $dangling_head, \&snag, \&snag, \&snag; + keycommits $dangling_head, $unclean,$unclean,$unclean; stitch($dangling_head, $ffq_prev, $gdrlast, $ffq_prev_commitish, $prose); } @@ -1316,14 +1316,14 @@ sub cmd_stitch () { my $prose = 'stitch'; GetOptions('prose=s', \$prose) or die badusage("bad options to stitch"); badusage "no arguments allowed" if @ARGV; - do_stitch($prose); + do_stitch $prose, \&snag; } sub cmd_prepush () { cmd_stitch(); } sub cmd_quick () { badusage "no arguments allowed" if @ARGV; do_launder_head 'launder for git-debrebase quick'; - do_stitch 'quick'; + do_stitch 'quick', \&snag; } sub cmd_conclude () { @@ -1336,7 +1336,7 @@ sub cmd_conclude () { badusage "no arguments allowed" if @ARGV; do_launder_head 'launder for git-debrebase quick'; - do_stitch 'quick'; + do_stitch 'quick', \&snag; } sub cmd_convert_from_gbp () { |