summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2019-06-06 12:54:33 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2019-06-28 12:45:38 +0100
commit43fdff73d08efd6dfc74b3e830492048bf7b76dc (patch)
tree3f93d99cda6de690a86264250671c2b0e1e10138
parent75b7a4c726144473f4a0c38d17d34d7b67c0f8ba (diff)
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>
-rwxr-xr-xdgit2
1 files changed, 1 insertions, 1 deletions
diff --git a/dgit b/dgit
index cbdf376..70f28dc 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) = @_;