From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 22 Jun 2018 15:48:21 +0000 (+0100)
Subject: dgit: git-debrebase interop: Actually tolerate git-debrebase status 7
X-Git-Tag: archive/debian/5.2~3
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=866feb162b8f7e84039ed80e206c0df0def5f6c5;p=dgit.git

dgit: git-debrebase interop: Actually tolerate git-debrebase status 7

make-patches exiting with status 7 causes $?==7*256, not 7.

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

diff --git a/debian/changelog b/debian/changelog
index 8f093d44..009e19fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,8 @@ dgit (5.2~) unstable; urgency=medium
   * Print a warning to stderr on `dgit fetch sid', if your vcs-git
     remote url disagrees with what's in sid's .dsc.
   * git-debrebase interop: Add a missing debugcmd debugging print.
+  * git-debrebase interop: Actually tolerate git-debrebase make-patches
+    exiting with status 7.
 
   test suite:
   * Use nproc(1) rather than Sys::CPU.  This is more portable and does not
diff --git a/dgit b/dgit
index 88db2432..5c9cdc3e 100755
--- a/dgit
+++ b/dgit
@@ -5571,7 +5571,7 @@ END
 	if (act_local()) {
 	    debugcmd "+",@cmd;
 	    $!=0; $?=-1;
-	    failedcmd @cmd if system @cmd and $?!=7;
+	    failedcmd @cmd if system @cmd and $?!=7*256;
 	} else {
 	    dryrun_report @cmd;
 	}