summaryrefslogtreecommitdiff
path: root/git-debrebase
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-11 20:14:58 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-11 20:14:58 +0100
commitc7edc2e1f2bd904b49303de8e7800b973be5492c (patch)
treeae40e5ab5db77095e2b810d5b8814d5a305d6275 /git-debrebase
parent186b386b3adc95b515109a430cad3d82b4d637dd (diff)
git-debrebase: merge: Introduce merge_attempt_cmd global
NFC Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-xgit-debrebase21
1 files changed, 12 insertions, 9 deletions
diff --git a/git-debrebase b/git-debrebase
index 25ebbe6..f332cfd 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -417,6 +417,17 @@ sub mwrecknote ($$$) {
$wrecknotes->{$reftail} = $commitish;
}
+sub merge_attempt_cmd {
+ my $wrecknotes = shift @_;
+ debugcmd '+', @_;
+ $!=0; $?=-1;
+ if (system @_) {
+ merge_failed $wrecknotes,
+ failedcmd_waitstatus(),
+ "failed command: @_";
+ }
+}
+
sub merge_series ($$$;@) {
my ($newbase, $wrecknotes, $base_q, @input_qs) = @_;
# $base_q{SeriesBase} $input_qs[]{SeriesBase}
@@ -445,15 +456,7 @@ sub merge_series ($$$;@) {
my $mwrecknote = sub { &mwrecknote($wrecknotes, @_); };
- my $attempt_cmd = sub {
- debugcmd '+', @_;
- $!=0; $?=-1;
- if (system @_) {
- merge_failed $wrecknotes,
- failedcmd_waitstatus(),
- "failed command: @_";
- }
- };
+ my $attempt_cmd = sub { &merge_attempt_cmd($wrecknotes, @_); };
local $workarea;
fresh_workarea "merge";