We used to both change the working directory and set GIT_WORK_TREE when calling git merge-recursive. This works with older versions of git (up to and including 1.5.4.x, or thereabouts) because merge-recursive ignores GIT_WORK_TREE. It stopped doing that sometime just before 1.5.5, which broke StGit. (Given both GIT_WORK_TREE=".." and cwd "..", it assumed the work tree was at "../..", instead of just ".." like we intended. This made t2800 fail.)
Just dropping the cd would solve the problem for new gits, but would break StGit with older gits. But it works in both cases if we keep the cd, and unconditionally set GIT_WORK_TREE=".". So this patch does precisely that.
(git read-tree -u -m is also called from IndexAndWorktree, and it
seems to always ignore GIT_WORK_TREE just like merge-recursive used
to do. The patch fixes all calls made from IndexAndWorktree, so we're
good if read-tree starts heeding GIT_WORK_TREE in the future.)
Signed-off-by: Karl Hasselström <kha@treskal.com>
---
stgit/lib/git.py | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
Show changes to stgit/lib/git.py +9 −5
diff --git a/stgit/lib/git.py b/stgit/lib/git.py
index 35b9bbf..c5b048f 100644
--- a/stgit/lib/git.py
+++ b/stgit/lib/git.py
@@ -298,6 +298,10 @@ class RunWithEnv(object):
def run(self, args, env = {}):
return run.Run(*args).env(utils.add_dict(self.env, env))
+class RunWithEnvCwd(RunWithEnv):
+ def run(self, args, env = {}):
+ return RunWithEnv.run(self, args, env).cwd(self.cwd)
+
class Repository(RunWithEnv):
def __init__(self, directory):
self.__git_dir = directory
@@ -490,19 +494,20 @@ class Index(RunWithEnv):
class Worktree(object):
def __init__(self, directory):
self.__directory = directory
- env = property(lambda self: { 'GIT_WORK_TREE': self.__directory })
+ env = property(lambda self: { 'GIT_WORK_TREE': '.' })
directory = property(lambda self: self.__directory)
class CheckoutException(exception.StgException):
pass
-class IndexAndWorktree(RunWithEnv):
+class IndexAndWorktree(RunWithEnvCwd):
def __init__(self, index, worktree):
self.__index = index
self.__worktree = worktree
index = property(lambda self: self.__index)
env = property(lambda self: utils.add_dict(self.__index.env,
self.__worktree.env))
+ cwd = property(lambda self: self.__worktree.directory)
def checkout(self, old_tree, new_tree):
# TODO: Optionally do a 3-way instead of doing nothing when we
# have a problem. Or maybe we should stash changes in a patch?
@@ -512,7 +517,7 @@ class IndexAndWorktree(RunWithEnv):
self.run(['git', 'read-tree', '-u', '-m',
'--exclude-per-directory=.gitignore',
old_tree.sha1, new_tree.sha1]
- ).cwd(self.__worktree.directory).discard_output()
+ ).discard_output()
except run.RunException:
raise CheckoutException('Index/workdir dirty')
def merge(self, base, ours, theirs):
@@ -524,8 +529,7 @@ class IndexAndWorktree(RunWithEnv):
theirs.sha1],
env = { 'GITHEAD_%s' % base.sha1: 'ancestor',
'GITHEAD_%s' % ours.sha1: 'current',
- 'GITHEAD_%s' % theirs.sha1: 'patched'}
- ).cwd(self.__worktree.directory)
+ 'GITHEAD_%s' % theirs.sha1: 'patched'})
r.discard_output()
except run.RunException, e:
if r.exitcode == 1:
Karl Hasselström