Teach git-p4 about git-workspaces. 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): -- 2.11.0.274.g0ea315c