X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=f46e55a4e10969f0604f6b22a01aeebe836285e3;hp=b63910eda159a71f0ffd4553cb3660f7b13ffac7;hb=c26f96c431c935b9cf8044fae9894bfdcadbbc97;hpb=c1c45feee9c79e9a2dfe20771405ba4f8d548642

diff --git a/dgit b/dgit
index b63910ed..f46e55a4 100755
--- a/dgit
+++ b/dgit
@@ -398,7 +398,7 @@ our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
 
 sub runcmd {
     debugcmd "+",@_;
-    $!=0; $?=0;
+    $!=0; $?=-1;
     failedcmd @_ if system @_;
 }
 
@@ -533,7 +533,7 @@ sub git_slurp_config () {
     my @cmd = (@git, qw(config -z --get-regexp .*));
     debugcmd "|",@cmd;
 
-    open GITS, "-|", @cmd or failedcmd @cmd;
+    open GITS, "-|", @cmd or die $!;
     while (<GITS>) {
 	chomp or die;
 	printdebug "=> ", (messagequote $_), "\n";
@@ -1160,7 +1160,7 @@ sub check_for_git () {
 	     " set -e; cd ".access_cfg('git-path').";".
 	     " if test -d $package.git; then echo 1; else echo 0; fi");
 	my $r= cmdoutput @cmd;
-	if ($r =~ m/^divert (\w+)$/) {
+	if (defined $r and $r =~ m/^divert (\w+)$/) {
 	    my $divert=$1;
 	    my ($usedistro,) = access_distros();
 	    # NB that if we are pushing, $usedistro will be $distro/push
@@ -1169,7 +1169,7 @@ sub check_for_git () {
 	    progress "diverting to $divert (using config for $instead_distro)";
 	    return check_for_git();
 	}
-	failedcmd @cmd unless $r =~ m/^[01]$/;
+	failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
 	return $r+0;
     } elsif ($how eq 'url') {
 	my $prefix = access_cfg('git-check-url','git-url');
@@ -1243,7 +1243,7 @@ sub git_write_tree () {
 sub remove_stray_gits () {
     my @gitscmd = qw(find -name .git -prune -print0);
     debugcmd "|",@gitscmd;
-    open GITS, "-|", @gitscmd or failedcmd @gitscmd;
+    open GITS, "-|", @gitscmd or die $!;
     {
 	local $/="\0";
 	while (<GITS>) {
@@ -1259,7 +1259,7 @@ sub remove_stray_gits () {
 sub mktree_in_ud_from_only_subdir () {
     # changes into the subdir
     my (@dirs) = <*/.>;
-    die unless @dirs==1;
+    die "@dirs ?" unless @dirs==1;
     $dirs[0] =~ m#^([^/]+)/\.$# or die;
     my $dir = $1;
     changedir $dir;
@@ -1782,9 +1782,9 @@ sub check_not_dirty () {
 
     my @cmd = (@git, qw(diff --quiet HEAD));
     debugcmd "+",@cmd;
-    $!=0; $?=0; system @cmd;
-    return if !$! && !$?;
-    if (!$! && $?==256) {
+    $!=0; $?=-1; system @cmd;
+    return if !$?;
+    if ($?==256) {
 	fail "working tree is dirty (does not match HEAD)";
     } else {
 	failedcmd @cmd;
@@ -2015,7 +2015,7 @@ END
     my $diffopt = $debuglevel>0 ? '--exit-code' : '--quiet';
     my @diffcmd = (@git, qw(diff), $diffopt, $tree);
     debugcmd "+",@diffcmd;
-    $!=0; $?=0;
+    $!=0; $?=-1;
     my $r = system @diffcmd;
     if ($r) {
 	if ($r==256) {
@@ -3003,7 +3003,7 @@ sub quilt_check_splitbrain_cache ($$) {
     my $splitbrain_cachekey;
     
     progress
- "dgit: split brain (separate dgit view) may needed (--quilt=$quilt_mode).";
+ "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
     # we look in the reflog of dgit-intern/quilt-cache
     # we look for an entry whose message is the key for the cache lookup
     my @cachekey = (qw(dgit), $our_version);