From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Aug 2018 19:14:58 +0000 (+0100)
Subject: git-debrebase: merge: Introduce merge_attempt_cmd global
X-Git-Tag: archive/debian/6.7~76
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=c7edc2e1f2bd904b49303de8e7800b973be5492c

git-debrebase: merge: Introduce merge_attempt_cmd global

NFC

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

diff --git a/git-debrebase b/git-debrebase
index 25ebbe6f..f332cfd4 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";