mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
This commit is contained in:
Simon Hausmann
2007-05-16 12:12:39 +02:00
parent c3c4624451
commit dc1a93b6dc
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/fast-import/git-p4
View File

@ -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"):