mirror of
https://github.com/git/git.git
synced 2024-11-23 18:05:29 +08:00
Fix calling git-p4 rebase from within a subdirectory (git rebase wants to be in toplevel)
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
This commit is contained in:
parent
c3c4624451
commit
dc1a93b6dc
@ -1197,6 +1197,8 @@ if cmd.needsGit:
|
||||
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"):
|
||||
|
Loading…
Reference in New Issue
Block a user