From: Joey Hess <joey@kitenet.net>
Date: Tue, 27 Mar 2012 23:42:49 +0000 (-0400)
Subject: Detect git submodules procuded by recent git, where .git is a file, not a directory... 
X-Git-Tag: 1.23~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=114bb690e4c7b994097ffd83e2baadf159fdc222;p=tools%2Fpristine-tar.git

Detect git submodules procuded by recent git, where .git is a file, not a directory. Closes: #666033
---

diff --git a/debian/changelog b/debian/changelog
index a5d2dcf..a231b81 100644
--- 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 6db8c47..c75e4fc 100755
--- 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';
 	}