With -DDDD, print out all gitcfg references (copious!)

diff --git a/debian/changelog b/debian/changelog
index 8a3490baeee438f34cb9344c7773f5d00b428574..c1088399f37e68273f499ceef87089313358228f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,6 +40,7 @@ dgit (1.1~~) unstable; urgency=low
     the user about how to retry.  Closes:#793144.
   * Honour dgit-distros.DISTRO.cmd-CMD and .opts-CMD.  Closes:#793427.
   * Slurp in entire git config, for better performance.
+  * With -DDDD, print out all gitcfg references (copious!)
 
  --
 

diff --git a/dgit b/dgit
index bcb6a9c2d040e5adfe3c12f2c8dc8402b2456f6f..56cee1140814185072007d6acf2f2e9336b9f6dd 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -528,6 +528,8 @@ sub git_slurp_config () {
 sub git_get_config ($) {
     my ($c) = @_;
     my $l = $gitcfg{$c};
+    printdebug"C $c ".(defined $l ? messagequote "'$l'" : "undef")."\n"
+       if $debuglevel >= 4;
     $l or return undef;
     @$l==1 or badcfg "multiple values for $c" if @$l > 1;
     return $l->[0];
@@ -3185,8 +3187,10 @@ sub finalise_opts_opts () {
        }
 
        foreach my $c (access_cfg_cfgs("opts-$k")) {
-           local ($debuglevel) = $debuglevel-2;
            my $vl = $gitcfg{$c};
+           printdebug "CL $c ",
+               ($vl ? join " ", map { shellquote } @$vl : ""),
+               "\n" if $debuglevel >= 4;
            next unless $vl;
            badcfg "cannot configure options for $k"
                if $opts_opt_cmdonly{$k};

diff --git a/dgit.1 b/dgit.1
index 2e862e3fdb8e73b5b27be9291eeac4c795e7bdae..1507d4304ba25c57bc46b8de0ed8edcfa3e058a9 100644 (file)
--- a/dgit.1
+++ b/dgit.1
@@ -376,7 +376,7 @@ fixing up, dgit push will fail.
 .TP
 .BI -D
 Prints debugging information to stderr.  Repeating the option produces
-more output (currently, up to -DDD is meaningfully different).
+more output (currently, up to -DDDD is meaningfully different).
 .TP
 .BI -c name = value
 Specifies a git configuration option, to be used for this run.