From 09e16455e028ae264347067a8c86a7b9a1e5889c Mon Sep 17 00:00:00 2001
From: Simon Hausmann <hausmann@kde.org>
Date: Mon, 19 Mar 2007 11:57:07 +0100
Subject: [PATCH] Improved the git dir detection.
Signed-off-by: Simon Hausmann <hausmann@kde.org>
---
contrib/fast-import/p4-git-sync.py | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/contrib/fast-import/p4-git-sync.py b/contrib/fast-import/p4-git-sync.py
index ed88debd45..5a3bf90485 100755
--- a/contrib/fast-import/p4-git-sync.py
+++ b/contrib/fast-import/p4-git-sync.py
@@ -37,6 +37,11 @@ def die(msg):
sys.stderr.write(msg + "\n")
sys.exit(1)
+def tryGitDir(path):
+ if os.path.exists(path + "/HEAD") and os.path.exists(path + "/refs") and os.path.exists(path + "/objects"):
+ return True;
+ return False
+
try:
opts, args = getopt.getopt(sys.argv[1:], "", [ "continue", "git-dir=", "origin=", "reset", "master=",
"submit-log-subst=", "log-substitutions=", "noninteractive",
@@ -86,6 +91,14 @@ if len(gitdir) == 0:
else:
os.environ["GIT_DIR"] = gitdir
+if not tryGitDir(gitdir):
+ if tryGitDir(gitdir + "/.git"):
+ gitdir += "/.git"
+ os.environ["GIT_DIR"] = gitdir
+ else:
+ die("fatal: %s seems not to be a git repository." % gitdir)
+
+
configFile = gitdir + "/p4-git-sync.cfg"
origin = "origin"