Bug#1114902: uscan: mode=git no longer works with safe.bareRepository = explicit

[Rebecca N. Palmer]

Package: devscripts
Version: 2.25.15

I have safe.bareRepository = explicit set in my .gitconfig.  gbp 
import-orig --uscan of mode=git d/watch files (e.g. rpy2) worked in 
bookworm, but does not work in trixie:

fatal: cannot use bare repository 
'/home/rnpalmer/Debian/sourcepkgs/rpy2-temporary.6966.git' 
(safe.bareRepository is 'explicit')
uscan: error: git rev-parse --git-path info/ subprocess returned exit 
status 128

This fixes it for me, but I'm *not* calling it a patch because it 
probably breaks submodule support:

--- a/lib/Devscripts/Uscan/Downloader.pm
+++ b/lib/Devscripts/Uscan/Downloader.pm
@@ -265,7 +265,7 @@ sub download ($$$$$$$$) {

                 for (my $tmp, my $i = 0 ; $i < @gitpaths ; $i++) {
                     my @cmd
-                      = ("git", "rev-parse", "--git-path", ${ gitpaths 
[$i] });
+                      = ("git", "--git-dir=.", "rev-parse", 
"--git-path", ${ gitpaths [$i] });
                     spawn(
                         exec      => [@cmd],
                         to_string => \$tmp,
@@ -298,7 +298,7 @@ sub download ($$$$$$$$) {
             }

             # archive main repository
-            uscan_exec_no_fail('git', 'archive', '--format=tar',
+            uscan_exec_no_fail('git','--git-dir=.', 'archive', 
'--format=tar',
                 "--prefix=$pkg-$ver/",
                 "--output=$abs_dst/$pkg-$ver.tar", $gitref) == 0
               or $clean_and_die->("$gitrepo_dir", "git archive failed");