Fixing syncing (gitdir discovery / cd) for bare repositories

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 70366ff8c06bb96adc8795a11df1ab4f319b737d..239304857d894e3612d71d90185606955bfa5d22 100755 (executable)
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -1200,7 +1200,9 @@ if cmd.needsGit:
         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]);
+                cdup = mypopen("git rev-parse --show-cdup").read()[:-1];
+                if len(cdup) > 0:
+                    os.chdir(cdup);
 
     if not isValidGitDir(gitdir):
         if isValidGitDir(gitdir + "/.git"):