Detect git submodules procuded by recent git, where .git is a file, not a directory...

diff --git a/debian/changelog b/debian/changelog
index a5d2dcf949d05889aee01a7642449d182f7dd26b..a231b816b6b81f4874c91960aee06a68780511d0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pristine-tar (1.23) UNRELEASED; urgency=low
+
+  * Detect git submodules procuded by recent git, where .git is a file,
+    not a directory. Closes: #666033
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 27 Mar 2012 19:42:25 -0400
+
 pristine-tar (1.22) unstable; urgency=low
 
   * Store the sha1 of the tree that is being committed, rather than

diff --git a/pristine-tar b/pristine-tar
index 6db8c47d1cbd90065fe35629f7e317377f041698..c75e4fc08521352b003da5c6176dca6735413730 100755 (executable)
--- a/pristine-tar
+++ b/pristine-tar
@@ -528,7 +528,7 @@ sub gendelta {
 }
 
 sub vcstype {
-       if (-d ".git" ||
+       if (-e ".git" ||
            (exists $ENV{GIT_DIR} && length $ENV{GIT_DIR})) {
                return 'git';
        }