On 5 December 2016 at 20:53, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Luke Diamand <luke@xxxxxxxxxxx> writes: > >> Teach git-p4 about git-workspaces. > > Is this what we call "git worktree", or something else? Ah, I think you're right! > >> >> Signed-off-by: Luke Diamand <luke@xxxxxxxxxxx> >> --- >> git-p4.py | 6 ++++++ >> 1 file changed, 6 insertions(+) >> >> diff --git a/git-p4.py b/git-p4.py >> index 0c4f2afd2..5e2db1919 100755 >> --- a/git-p4.py >> +++ b/git-p4.py >> @@ -566,6 +566,12 @@ def isValidGitDir(path): >> if (os.path.exists(path + "/HEAD") >> and os.path.exists(path + "/refs") and os.path.exists(path + "/objects")): >> return True; >> + >> + # git workspace directory? >> + if (os.path.exists(path + "/HEAD") >> + and os.path.exists(path + "/gitdir")): >> + return True >> + >> return False >> >> def parseRevision(ref):