Update upstream source from tag 'upstream/1.18'

Update to upstream version '1.18'
with Debian dir 29f694d865fe2fa7bb87af4582b4f6d7b30e7073

14 files changed, 77 insertions, 58 deletions

diff --git a/Changes b/Changes
index 1e230aa..be5e035 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,10 @@
 Revision history for perl module Config::GitLike
 
+1.18 2020-03-12
+ - Return a more correct `dir_file` for Config::GitLike::Git; this
+   change is not backwards-compatible, but matches behavior to existing
+   documentation and expectation.
+
 1.17 2017-07-16
  - Read and write files with non-UNIX-newlines
  - Filter multiple values correctly when using `get_regexp`
diff --git a/MANIFEST b/MANIFEST
index 14f19fb..e535df9 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -14,6 +14,7 @@ lib/Config/GitLike/Git.pm
 Makefile.PL
 MANIFEST			This list of files
 META.yml
+SIGNATURE
 t/00_use.t
 t/casing.t
 t/comment.t
@@ -26,4 +27,3 @@ t/platforms.t
 t/t1300-repo-config.t
 t/unix.conf
 t/util/translate.pl
-SIGNATURE                                Public-key signature (added by MakeMaker)
diff --git a/META.yml b/META.yml
index 650df6b..cfa5b09 100644
--- a/META.yml
+++ b/META.yml
@@ -9,7 +9,7 @@ configure_requires:
   ExtUtils::MakeMaker: 6.59
 distribution_type: module
 dynamic_config: 1
-generated_by: 'Module::Install version 1.18'
+generated_by: 'Module::Install version 1.19'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -27,4 +27,4 @@ requires:
 resources:
   license: http://dev.perl.org/licenses/
   repository: http://github.com/bestpractical/config-gitlike
-version: '1.17'
+version: '1.18'
diff --git a/SIGNATURE b/SIGNATURE
index ba9c4d3..d9cb750 100644
--- a/SIGNATURE
+++ b/SIGNATURE
@@ -1,5 +1,5 @@
 This file contains message digests of all files listed in MANIFEST,
-signed via the Module::Signature module, version 0.79.
+signed via the Module::Signature module, version 0.83.
 
 To verify the content in this distribution, first make sure you have
 Module::Signature installed, then type:
@@ -12,50 +12,49 @@ the distribution may already have been compromised, and you should
 not run its Makefile.PL or Build.PL.
 
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-SHA1 917fa846691295e7c7f386d2417cc4df46c64257 Changes
-SHA1 671ffd9e57a56b87c3aa6c311274770bc4ec0b75 MANIFEST
-SHA1 3274a397ad59d7854e333d7f780b63914662cd6b META.yml
-SHA1 52cb72683bcd12cb0eb441f2b31f08bceb87a2d0 Makefile.PL
-SHA1 fb87e7e7964647af0e7f6422bc7943754935dca7 inc/Module/Install.pm
-SHA1 06ca84c52f555dfd7cf8bb7c941c975e25adfc9d inc/Module/Install/Base.pm
-SHA1 3eeb29878c8a435182b492e22315166a0229a373 inc/Module/Install/Can.pm
-SHA1 b3839b235991bae672b2db69de102cccef72ef8f inc/Module/Install/ExtraTests.pm
-SHA1 3bb596078a0413cc568ff3a834d9fc54dbddd54b inc/Module/Install/Fetch.pm
-SHA1 5885b5a7af6c3d54cbeb1274a896a565e5cbdb9a inc/Module/Install/Makefile.pm
-SHA1 9247628a32ad889e815a356fb39b2bc94ff3cc3a inc/Module/Install/Metadata.pm
-SHA1 b0b3ad3cfea40b508eb61e0e5c8ea477f81f3eb1 inc/Module/Install/Win32.pm
-SHA1 b162866505fb2a1141efa422cfdc864394cb4444 inc/Module/Install/WriteAll.pm
-SHA1 00dc2b5afaf35b72c9e54af90a43e8338c94206a lib/Config/GitLike.pm
-SHA1 806e7cb2ac15a460866e1e1c9c3984ad41d2f850 lib/Config/GitLike/Cascaded.pm
-SHA1 a15b556bdedea16668a170ea52e2ff6f415b7295 lib/Config/GitLike/Git.pm
-SHA1 8c30f69743e7a9d743d7206f2306ff9f12bb59a0 t/00_use.t
-SHA1 6b2873180b2db6e0a122e5874fc74927c4470355 t/casing.t
-SHA1 34c0acc86d479971c0723abac2dc4bbbca3247bb t/comment.t
-SHA1 8b2803a04139668a93eeead8e90ab2ce53e599f1 t/dos.conf
-SHA1 0e98fd5383d929fbe63e3513a7697478c3abbf51 t/encoding.t
-SHA1 0813010c4459e7e7e1824283eb4ea36f6b5c1391 t/get_regexp_filter_multiple.t
-SHA1 e884df4ffae7428768c76b54882ba3872d5a3b47 t/lib/TestConfig.pm
-SHA1 b086291482ee5dca0ca4e5dfb8dc65291c8cd560 t/mac.conf
-SHA1 b82ae53518889fc295b4cd59e923151e2e289cbd t/platforms.t
-SHA1 24a4fbfdeb3268280fa1a10ac5934274c33a9a55 t/t1300-repo-config.t
-SHA1 8d0a69c0b80d383ba1fb5a60ca3beb2edf0668b0 t/unix.conf
-SHA1 53b21b0f0227909dd299d8adb033f5aff8f5fc42 t/util/translate.pl
+SHA256 5646ee3d73fa04e4b52a7d10e25692264f18caa1eece400b15d9075ced98096a Changes
+SHA256 407a5d3c5cbd61f43c7c1d5ab07eab02baeeb71294f1560f9c3e54c0e51aead1 MANIFEST
+SHA256 422647f0d4f3c6a216993f8df4f2e90a555c999ab384757f2ded1bff11e2404a META.yml
+SHA256 7d63a26075445fa1a4e61c546bcbade14fc29547947be21034c2ca5332e4ecc8 Makefile.PL
+SHA256 67d139199c03b8bf8447a5a62f0d0b6dc1bd5bf6dbe04de6d21998c577823ed6 inc/Module/Install.pm
+SHA256 6ebcc53a161dd5dc0aae69e4704575f2b00181901d768a82e26722a309cfdbe4 inc/Module/Install/Base.pm
+SHA256 d3f8c839d03fd21c197d05362dbb277cd7cadb15da6390d124b61e851f15146e inc/Module/Install/Can.pm
+SHA256 3f5f298d2804c3c283d5d75d1bdc972b1a178a27c4e981959d070ce41bb89b9f inc/Module/Install/ExtraTests.pm
+SHA256 e9e72e18921c10c87bc4ea4c20af83e52015b9f5775d00ac64073042403717ca inc/Module/Install/Fetch.pm
+SHA256 a7a681bf2c9eee58a372cb642ffe42b0301d1200432ba8de9f7791cd1ecc9827 inc/Module/Install/Makefile.pm
+SHA256 aa887fa65a5eb6bbd1805706ce298b3f3cd55b353ecfd37aa7d35ae419331a49 inc/Module/Install/Metadata.pm
+SHA256 26b166ff62aacdb55317d1659f160aa4935097eea9810ea980e6d747206b5dc0 inc/Module/Install/Win32.pm
+SHA256 5f73a6851a91ea44e65b924f918743ad6e860620ad7a38a39d0295e0c5652a9f inc/Module/Install/WriteAll.pm
+SHA256 524aea674343b6029b7991bcc14a35efc425461073c62d0bce2ec7241b704789 lib/Config/GitLike.pm
+SHA256 726d345a29c4f89f358e7fbc7c28b224655a67022316a5bff7f101cbfaddaee9 lib/Config/GitLike/Cascaded.pm
+SHA256 f39e5ae87dd44ebe353c05de9f4360f624dd8978efbecbeb3f77d55b1ac3507a lib/Config/GitLike/Git.pm
+SHA256 79d053d9bd28a6e392ad984a7a1e8ba534d31b7300cab8003f042695579e69ac t/00_use.t
+SHA256 f130bb4e5cdf84603ab4fe6f02a03353b8d5ac29692a237fef24a8fc7a54c5cc t/casing.t
+SHA256 1478c9bbe8fcf741cbd60d89493caa2568d4094609363b1d39dbf035b06a09ea t/comment.t
+SHA256 cb7b2032ac6d96caae6d2c12501b7878cb95733e5f6be77b9f5216c0e9c08429 t/dos.conf
+SHA256 ed1f83906ea7244d88e02d9813c5141257a6e15f5be35e5506800a6f8e3171d3 t/encoding.t
+SHA256 57a969b7876f22fdc885e0aa24e6fa90f3057c263d89ab4f0f007bab203ffa33 t/get_regexp_filter_multiple.t
+SHA256 462faabb1cfaa37c87790426aa299e9c20ff4c11b4c8788bb26115f162a629e5 t/lib/TestConfig.pm
+SHA256 6ab11145dc9e06ed4fff8f7342243fe96727f37603fed6f106dcd4b766093f91 t/mac.conf
+SHA256 e147911a10bac7e0594bc036512422ba68bc9f80948d829acf3418e123655fcf t/platforms.t
+SHA256 a825d10438ed3187875124d22f1b1dea52fb5a0bd3dea7ae909b52cfdc31e83e t/t1300-repo-config.t
+SHA256 cb7b2032ac6d96caae6d2c12501b7878cb95733e5f6be77b9f5216c0e9c08429 t/unix.conf
+SHA256 734a34df3e8bda32907cdde139ff80541aca71fc5e09fe77c9e04c0d9e51436e t/util/translate.pl
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
 
-iQIcBAEBCgAGBQJZbBTUAAoJEJHs6NvKxcMFMmAP/j98nI/9O5ALjiDs1kDpfTkv
-DPZ2VidojTtBW7vWS9uI9jXMFMYvdm8YpgF1QzJ7o1wjWF2Gl+OQBTeAKDoP4bZR
-/IgrnICTBPfiRWEEIDy8C5Ue5M+er0rJTb0UgLxc0Jb3vif3wUuSBvkngY8R39k4
-6gxa41mAgCy3g887samjmtD0/3kNx088JngO+NXRniXs3xILopnacXkjrYhGcgkD
-uqJkGnxNG6IB1q4b7L8/l4aUy7f1tDOc2SrxHbFAaWT4OJRP5PWl3bL2FTNbcQIT
-Aen5fcIV7fpapYaEtb4QTwdFui7rCF1li7W7e9QNDRvVwMYPhlexH1azswyijVoc
-rSJeN15h/pBL0sQTDvTE+Tbucgsfs81ExicMYDr3HkKBCa4vrf90bgSlrL375ixz
-jsEmNdc8BSaWFe55g/9bcPFlOpskydsm4juFk6B3rI+AKhZwVmeLEvb2dEUGttvY
-XGGIzYO+WzZCinfHFBNxPRCtkgcqdlenzDlpAhI3yspAo9tYpZGmbEZiTFusD1Z6
-/FVljS/pXnBz76uDKs6s1GmsGKL2k94E+YUepkalYV2x3jzEzSETqSp59FQd+OEC
-uA1NdvIPScE0hqRuxQGg7S7INqZyxgv+XgVRq4XTQQLLlBaFS3wuSQ9GZZBbFqFC
-u+zhkpKpBTPfFSKa4z+b
-=w7MY
+iQIzBAEBCAAdFiEEjbxBryL5b+Ppzen1kezo28rFwwUFAl5rJa8ACgkQkezo28rF
+wwUm6w//bGN28vI2GCcOiZDtZpSCbjua6eIXNL9KQ0lQcuSPIvJNpkgiIfR5sJ29
+j8ncDZIYADp9dmtXXiTJudmk7w2jrvbIWGiY3E3CC7bDUDqcQLTkKvWyKntk9sZF
+Uu98gU4Pens16AtyWKYgrQ94WSOzZL8Od5Py511vo0JUGxC8ww2q54THOJYtvdic
+46amyXr85edXI/XYQ/H21npauoxrUcPEWybuvQBkIY+3tmVr4xiwUrBTX0isi8XQ
+K7TvuQYUq+VQOfhIsdq3aod4+jJWPUmAW8AAcSYzHr62JbZy2cG2wu381zAM1H/I
+MwfbeFHc0ZYRMZ0h5POGlXSRIqqsYhDFr6kXMLmVrpkZDn7V4JWAW20scksNZ0Jh
+PPeoUjthjnb4LUHIdRQCulJISRD+G1ZsGy1/ArZSnEH+RW47/plosqQkC1nTmzGd
+HET5tFjunXxlwFtDkR3tku1AfNTReI5xzyIzw3sDrmlpM86AwrcTzmOpsh64ejI4
+tNS/hKkBn0zpT++riB11ybiVHNPqO0wzfX5ROQdvexdeZbscwlYmCHFCcdncGhvw
+nRex8A2MYvAZiXucTuEU/mDZaetvcYAKl81mzFZVbz4q8fAR6FApMKNelaDkizqM
+ca0sBWUEFo2NK90ai+djqdjk/ePqOK1jVOSBDm1UMbecABo38lo=
+=pPjZ
 -----END PGP SIGNATURE-----
diff --git a/inc/Module/Install.pm b/inc/Module/Install.pm
index 07525c5..7ba98c2 100644
--- a/inc/Module/Install.pm
+++ b/inc/Module/Install.pm
@@ -31,7 +31,7 @@ BEGIN {
 	# This is not enforced yet, but will be some time in the next few
 	# releases once we can make sure it won't clash with custom
 	# Module::Install extensions.
-	$VERSION = '1.18';
+	$VERSION = '1.19';
 
 	# Storage for the pseudo-singleton
 	$MAIN    = undef;
diff --git a/inc/Module/Install/Base.pm b/inc/Module/Install/Base.pm
index b61d424..9fa42c2 100644
--- a/inc/Module/Install/Base.pm
+++ b/inc/Module/Install/Base.pm
@@ -4,7 +4,7 @@ package Module::Install::Base;
 use strict 'vars';
 use vars qw{$VERSION};
 BEGIN {
-	$VERSION = '1.18';
+	$VERSION = '1.19';
 }
 
 # Suspend handler for "redefined" warnings
diff --git a/inc/Module/Install/Can.pm b/inc/Module/Install/Can.pm
index 1de368c..d65c753 100644
--- a/inc/Module/Install/Can.pm
+++ b/inc/Module/Install/Can.pm
@@ -8,7 +8,7 @@ use Module::Install::Base ();
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '1.18';
+	$VERSION = '1.19';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }
diff --git a/inc/Module/Install/Fetch.pm b/inc/Module/Install/Fetch.pm
index 54b52cb..3072b08 100644
--- a/inc/Module/Install/Fetch.pm
+++ b/inc/Module/Install/Fetch.pm
@@ -6,7 +6,7 @@ use Module::Install::Base ();
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '1.18';
+	$VERSION = '1.19';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }
diff --git a/inc/Module/Install/Makefile.pm b/inc/Module/Install/Makefile.pm
index 8ba3d88..13a4464 100644
--- a/inc/Module/Install/Makefile.pm
+++ b/inc/Module/Install/Makefile.pm
@@ -8,7 +8,7 @@ use Fcntl qw/:flock :seek/;
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '1.18';
+	$VERSION = '1.19';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }
diff --git a/inc/Module/Install/Metadata.pm b/inc/Module/Install/Metadata.pm
index 692ce71..11bf971 100644
--- a/inc/Module/Install/Metadata.pm
+++ b/inc/Module/Install/Metadata.pm
@@ -6,7 +6,7 @@ use Module::Install::Base ();
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '1.18';
+	$VERSION = '1.19';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }
diff --git a/inc/Module/Install/Win32.pm b/inc/Module/Install/Win32.pm
index b80c900..f7aa615 100644
--- a/inc/Module/Install/Win32.pm
+++ b/inc/Module/Install/Win32.pm
@@ -6,7 +6,7 @@ use Module::Install::Base ();
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '1.18';
+	$VERSION = '1.19';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }
diff --git a/inc/Module/Install/WriteAll.pm b/inc/Module/Install/WriteAll.pm
index da279c7..2db861a 100644
--- a/inc/Module/Install/WriteAll.pm
+++ b/inc/Module/Install/WriteAll.pm
@@ -6,7 +6,7 @@ use Module::Install::Base ();
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '1.18';
+	$VERSION = '1.19';
 	@ISA     = qw{Module::Install::Base};
 	$ISCORE  = 1;
 }
diff --git a/lib/Config/GitLike.pm b/lib/Config/GitLike.pm
index ae8b545..620ab62 100644
--- a/lib/Config/GitLike.pm
+++ b/lib/Config/GitLike.pm
@@ -8,7 +8,7 @@ use Scalar::Util qw(openhandle);
 use Fcntl qw(O_CREAT O_EXCL O_WRONLY);
 use 5.008;
 
-our $VERSION = '1.17';
+our $VERSION = '1.18';
 
 
 has 'confname' => (
@@ -1682,7 +1682,9 @@ precedence, you'll need to override L<"load"> as well.
 =head2 dir_file
 
 Return a string containing the path to a configuration file with the
-name C<confname> in a directory. The directory isn't specified here.
+name C<confname> in a directory.  Called with no arguments,
+returns the path for a generic directory; if called with a
+directory as an argument, returns the path for I<that> directory.
 
 =head2 global_file
 
diff --git a/lib/Config/GitLike/Git.pm b/lib/Config/GitLike/Git.pm
index 492195c..2169273 100644
--- a/lib/Config/GitLike/Git.pm
+++ b/lib/Config/GitLike/Git.pm
@@ -13,6 +13,17 @@ has '+compatible' => (
     default => 1,
 );
 
+sub dir_file {
+    my $self = shift;
+    return ".git/config" unless @_;
+    my $path = shift;
+    my $dir = $self->is_git_dir( $path );
+    return File::Spec->catfile( $dir, "config" ) if $dir;
+
+    $path = File::Spec->rel2abs( $path );
+    return File::Spec->catfile( $path, ".git/config");
+}
+
 sub is_git_dir {
     my $self = shift;
     my $path = File::Spec->rel2abs( shift );
@@ -83,7 +94,9 @@ This module overrides these methods from C<Config::GitLike>:
 
 =head2 dir_file
 
-The per-directory configuration file is F<.git/config>
+The per-directory configuration file is F<.git/config>.  With an
+optional directory argument, will return a fully-qualified path to the
+configuration file, as git would edit with C<git config --local -C path>.
 
 =head2 user_file