From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 28 Jun 2019 14:06:36 +0000 (+0100)
Subject: dgit: Put !! inside do_split_brain()
X-Git-Tag: archive/debian/9.0~95
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=7ef396b5c696d4de6b27630a91a0f6f2c006a030

dgit: Put !! inside do_split_brain()

No functional change.

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

diff --git a/dgit b/dgit
index 35b61a5e..03bf6c37 100755
--- a/dgit
+++ b/dgit
@@ -295,7 +295,7 @@ sub quiltmode_splitbrain () {
     $quilt_mode =~ m/gbp|dpm|unapplied/;
 }
 
-sub do_split_brain () { $do_split_brain // confess }
+sub do_split_brain () { !!($do_split_brain // confess) }
 
 sub opts_opt_multi_cmd {
     my $extra = shift;
@@ -4506,7 +4506,7 @@ END
 	}
     }
 
-    confess unless !!$made_split_brain == !!do_split_brain();
+    confess unless !!$made_split_brain == do_split_brain();
 
     changedir $playground;
     progress f_ "checking that %s corresponds to HEAD", $dscfn;
@@ -6210,7 +6210,7 @@ END
 
     progress f_ "starting quiltify (multiple patches, %s mode)", $quilt_mode;
     quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
-    runcmd @git, qw(checkout -q), (qw(master dgit-view)[!!do_split_brain()]);
+    runcmd @git, qw(checkout -q), (qw(master dgit-view)[do_split_brain()]);
 
     if (!open P, '>>', ".pc/applied-patches") {
 	$!==&ENOENT or confess "$!";
@@ -6695,7 +6695,7 @@ sub build_source {
 	unlink "$buildproductsdir/$sourcechanges" or $!==ENOENT
 	    or fail f_ "remove %s: %s", $sourcechanges, $!;
     }
-#    confess unless !!$made_split_brain == !!do_split_brain();
+#    confess unless !!$made_split_brain == do_split_brain();
 
     my @cmd = (@dpkgsource, qw(-b --));
     my $leafdir;