Browse Source

Fix calling git-p4 rebase from within a subdirectory (git rebase wants to be in toplevel)

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
maint
Simon Hausmann 18 years ago
parent
commit
dc1a93b6dc
  1. 2
      contrib/fast-import/git-p4

2
contrib/fast-import/git-p4

@ -1197,6 +1197,8 @@ if cmd.needsGit:
gitdir = ".git" gitdir = ".git"
if not isValidGitDir(gitdir): if not isValidGitDir(gitdir):
gitdir = mypopen("git rev-parse --git-dir").read()[:-1] 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 not isValidGitDir(gitdir):
if isValidGitDir(gitdir + "/.git"): if isValidGitDir(gitdir + "/.git"):

Loading…
Cancel
Save