From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 6 Jun 2019 11:54:33 +0000 (+0100)
Subject: dgit: split brain reorg: Change an internal error die to confess
X-Git-Tag: archive/debian/9.0~127
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=43fdff73d08efd6dfc74b3e830492048bf7b76dc;p=dgit.git

dgit: split brain reorg: Change an internal error die to confess

No functional change in non-error cases.  This was wrong before.

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

diff --git a/dgit b/dgit
index cbdf3764..70f28dc6 100755
--- a/dgit
+++ b/dgit
@@ -5424,7 +5424,7 @@ sub quiltify_splitbrain ($$$$$$$) {
     local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
     local $ENV{GIT_AUTHOR_DATE} =  $authline[2];
 
-    die unless $do_split_brain;
+    confess unless $do_split_brain;
 
     my $fulldiffhint = sub {
 	my ($x,$y) = @_;