Make it possible to invoke git-p4 from within subdirectories of a git working tree.
Signed-off-by: Simon Hausmann <hausmann@kde.org>
Simon Hausmann committed
Mar 21, 2007 at 13:05 UTC
20618650058741117d909e086c2e78c003e5cfcd
1 file changed
+4
contrib/fast-import/git-p4.py
+4
@@ -925,6 +925,10 @@ parser = optparse.OptionParser(cmd.usage.replace("%prog", "%prog " + cmdName),
925
gitdir = cmd.gitdir
926
if len(gitdir) == 0:
927
gitdir = ".git"
928
+ if not isValidGitDir(gitdir):
929
+ cdup = os.popen("git-rev-parse --show-cdup").read()[:-1]
930
+ if isValidGitDir(cdup + "/" + gitdir):
931
+ os.chdir(cdup)
932
933
if not isValidGitDir(gitdir):
934
if isValidGitDir(gitdir + "/.git"):