dgit: git_get_config: Use confess, not croak

Using croak was simply a mistake.  I always wanted a stack trace.

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

diff --git a/debian/changelog b/debian/changelog
index 7c2faacc0aed959d97620b821321ade39008aefc..d334b397ab2ed17ca42edfda4501068bfff1da32 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,8 @@
 dgit (3.6~) unstable; urgency=medium
 
   Minor improvements:
 dgit (3.6~) unstable; urgency=medium
 
   Minor improvements:

-  * Call `confess' to print a stack trace when we pass undef to
-    shellquote (eg as a result of debugcmd).  Turns an undefined
-    warning into an explicit internal error.
+  * Use `confess' to print a stack trace in a couple of internal error
+    rcases.

 
  --
 
 
  --
 

diff --git a/dgit b/dgit
index eb42b00dee0cb75d71e803280ff1c9f3677a2417..4f85e5c1d9aed3d4c4c0a3d531d44a56cd644e6a 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -669,7 +669,7 @@ sub git_get_config ($) {
     my ($c) = @_;
     foreach my $src (@gitcfgsources) {
        my $l = $gitcfgs{$src}{$c};
     my ($c) = @_;
     foreach my $src (@gitcfgsources) {
        my $l = $gitcfgs{$src}{$c};

-       croak "$l $c" if $l && !ref $l;
+       confess "internal error ($l $c)" if $l && !ref $l;

        printdebug"C $c ".(defined $l ?
                           join " ", map { messagequote "'$_'" } @$l :
                           "undef")."\n"
        printdebug"C $c ".(defined $l ?
                           join " ", map { messagequote "'$_'" } @$l :
                           "undef")."\n"