Changeset 1447 in tailor

Timestamp:

11/06/07 12:47:58 (6 years ago)

Author:

lele@…

Hash name:

20071106114758-97f81-3b66d06d8e8642a137b8bf99fd9ee2858d870e99

Message:

Tentatively fix bad value for GIT_DIR causing "fatal: Not a git repository" at bootstrap

File:

• vcpx/repository/git/__init__.py (modified) (2 diffs)

vcpx/repository/git/__init__.py

@@ -27 +27 @@
         Repository._load(self, project)
         self.EXECUTABLE = project.config.get(self.name, 'git-command', 'git')
-        self.overwrite_tags = project.config.get(self.name, 'overwrite-tags', False)
+        self.overwrite_tags = project.config.get(self.name, 'overwrite-tags', False)
         self.parent_repo = project.config.get(self.name, 'parent-repo')
         self.branch_point = project.config.get(self.name, 'branchpoint', 'HEAD')
@@ -44 +44 @@
         self.env = {}
 
+        # XXX: this seems plain wrong to me [who does not know git at
+        # all!]: why storagedir gets set to repository here? and why
+        # the need for the GIT_DIR envvar? I fail to see when
+        # storagedir should be different from '.git', the default,
+        # given how it's being used by this class! The same with
+        # GIT_INDEX_FILE, that accordingly with the man page defaults
+        # to ".git/index" anyway...
+        #
+        self.storagedir = self.METADIR
         if self.repository:
-            self.storagedir = self.repository
-            self.env['GIT_DIR'] = self.storagedir
+            from os.path import join
+
+            #self.storagedir = self.repository
+            #self.env['GIT_DIR'] = self.storagedir
+            self.env['GIT_DIR'] = join(self.basedir, self.METADIR)
             self.env['GIT_INDEX_FILE'] = self.METADIR + '/index'
-        else:
-            self.storagedir = self.METADIR
+        #else:
+        #    self.storagedir = self.METADIR
 
     def runCommand(self, cmd, exception=Exception, pipe=True):