From: Simon Hausmann <hausmann@kde.org>
Date: Tue, 20 Mar 2007 17:32:47 +0000 (+0100)
Subject: sync-to-perforce is now called submit and fixed the gitdir check a little bit
X-Git-Tag: v1.5.3-rc0~65^2^2~172
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=05140f342e1df7319dd3da2ef8157bfd5760fee6;p=git.git

sync-to-perforce is now called submit and fixed the gitdir check a little bit

Signed-off-by: Simon Hausmann <hausmann@kde.org>
---

diff --git a/contrib/fast-import/git-p4.py b/contrib/fast-import/git-p4.py
index fa1b19fbb..aca1bcaab 100755
--- a/contrib/fast-import/git-p4.py
+++ b/contrib/fast-import/git-p4.py
@@ -316,7 +316,7 @@ def printUsage(commands):
 commands = {
     "debug" : P4Debug(),
     "clean-tags" : P4CleanTags(),
-    "sync-to-perforce" : P4Sync()
+    "submit" : P4Sync()
 }
 
 if len(sys.argv[1:]) == 0:
@@ -350,7 +350,7 @@ if not isValidGitDir(gitdir):
     if isValidGitDir(gitdir + "/.git"):
         gitdir += "/.git"
     else:
-        dir("fatal: cannot locate git repository at %s" % gitdir)
+        die("fatal: cannot locate git repository at %s" % gitdir)
 
 os.environ["GIT_DIR"] = gitdir