Fix calling git-p4 rebase from within a subdirectory (git rebase wants to be in toplevel)
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index c48b257..ca6c623 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -1197,6 +1197,8 @@
gitdir = ".git"
if not isValidGitDir(gitdir):
gitdir = mypopen("git rev-parse --git-dir").read()[:-1]
+ if os.path.exists(gitdir):
+ os.chdir(mypopen("git rev-parse --show-cdup").read()[:-1]);
if not isValidGitDir(gitdir):
if isValidGitDir(gitdir + "/.git"):
