From: Victor Vasiliev <vasilvv@mit.edu>
Date: Fri, 11 Oct 2013 02:23:15 +0000 (-0400)
Subject: Handle Git submodules correctly
X-Git-Tag: 1.30~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=af6e9d027dbcbfbeed145d24ca152a92de2af568;p=tools%2Fpristine-tar.git

Handle Git submodules correctly

Due to the way submodules are organized in the latest versions of Git,
the working directory in the submodule repository configuration is set
to the relative path of submodule with respect to its physical GIT_DIR
location, instead of default ".". This confuses git-update-index, and
causes `pristine-tar commit' to fail.
---

diff --git a/pristine-tar b/pristine-tar
index 184c657..9005ddb 100755
--- a/pristine-tar
+++ b/pristine-tar
@@ -727,6 +727,7 @@ sub commitdelta {
 		# index, and without touching the working tree. Aka deep 
 		# git magick.
 		$ENV{GIT_INDEX_FILE}="$tempdir/index";
+		$ENV{GIT_WORK_TREE}="$tempdir";
 		if (! exists $ENV{GIT_DIR} || ! length $ENV{GIT_DIR}) {		
 			$ENV{GIT_DIR}=getcwd."/.git";
 		}