Merge branch 'js/t6500-use-windows-pid-on-mingw'

diff --git a/perl/Git.pm b/perl/Git.pm
index d856930b2e5f31bb7b1e7aef46e8e056068bb431..62c472e0ce41d507e88df86f6a022d1a08fbc4a6 100644 (file)
--- a/perl/Git.pm
+++ b/perl/Git.pm
@@ -980,7 +980,7 @@ sub cat_blob {
                return -1;
        }
 
-       if ($description !~ /^[0-9a-fA-F]{40} \S+ (\d+)$/) {
+       if ($description !~ /^[0-9a-fA-F]{40}(?:[0-9a-fA-F]{24})? \S+ (\d+)$/) {
                carp "Unexpected result returned from git cat-file";
                return -1;
        }