Make git-p4 work with bare repositories.

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 2633f299424056308f57fd93505803bb008fe8cd..84cdca1aa268902d7837fa4a7247287f91a878c2 100755 (executable)
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -1185,9 +1185,7 @@ if cmd.needsGit:
     if len(gitdir) == 0:
         gitdir = ".git"
         if not isValidGitDir(gitdir):
-            cdup = mypopen("git rev-parse --show-cdup").read()[:-1]
-            if isValidGitDir(cdup + "/" + gitdir):
-                os.chdir(cdup)
+            gitdir = mypopen("git rev-parse --git-dir").read()[:-1]
 
     if not isValidGitDir(gitdir):
         if isValidGitDir(gitdir + "/.git"):