chiark / gitweb /
dgit: split brain reorg: Change an internal error die to confess
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 6 Jun 2019 11:54:33 +0000 (12:54 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 28 Jun 2019 11:45:38 +0000 (12:45 +0100)
No functional change in non-error cases.  This was wrong before.

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

diff --git a/dgit b/dgit
index cbdf3764c2463782dbe7285bb278a4e70ea96698..70f28dc6f9023ed280778e8d0e9de9dc4b1be11c 100755 (executable)
--- 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) = @_;