From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 2 Oct 2018 12:31:16 +0000 (+0100)
Subject: Dgit.pm: reflog_cache_lookup: Replace `confess' with `die' after exec
X-Git-Tag: archive/debian/7.0~40
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=9e243b135e3ba9df16299a664c0fc3ff7e138349

Dgit.pm: reflog_cache_lookup: Replace `confess' with `die' after exec

With `confess' after `exec', perl complains

  Statement unlikely to be reached at /usr/share/perl5/Debian/Dgit.pm line 770.
	  (Maybe you meant system() when you said exec()?)

The error message's suggestion is not right here - what is wrong is
that confess is not really appropriate in the child in this way.

Replace it with die, using a better error string.

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

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 004daeb9..39c45983 100644
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -767,7 +767,7 @@ sub reflog_cache_lookup ($$) {
 	    printdebug ">(no reflog)\n";
 	    finish 0;
 	}
-	exec @cmd; confess $!;
+	exec @cmd; die f_ "exec %s: %s\n", $cmd[0], $!;
     }
     while (<GC>) {
 	chomp;