undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved the git dir detection.

Browse Source 
Signed-off-by: Simon Hausmann <hausmann@kde.org>
This commit is contained in:
Simon Hausmann 2007-03-19 11:57:07 +01:00
parent 228d36c92b
commit 09e16455e0
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
contrib/fast-import/p4-git-sync.py
View File

@ -37,6 +37,11 @@ def die(msg):
sys.stderr.write(msg + "\n") sys.stderr.write(msg + "\n")
sys.exit(1) 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: try:
opts, args = getopt.getopt(sys.argv[1:], "", [ "continue", "git-dir=", "origin=", "reset", "master=", opts, args = getopt.getopt(sys.argv[1:], "", [ "continue", "git-dir=", "origin=", "reset", "master=",
"submit-log-subst=", "log-substitutions=", "noninteractive", "submit-log-subst=", "log-substitutions=", "noninteractive",
@ -86,6 +91,14 @@ if len(gitdir) == 0:
else: else:
os.environ["GIT_DIR"] = gitdir 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" configFile = gitdir + "/p4-git-sync.cfg"
origin = "origin" origin = "origin"