summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Simon Hausmann <hausmann@kde.org>2007-03-20 18:32:47 +0100
committerLibravatar Simon Hausmann <hausmann@kde.org>2007-03-20 18:32:47 +0100
commit05140f342e1df7319dd3da2ef8157bfd5760fee6 (patch)
tree1bae40a6d409dcdab02747ec7b5883605eaf2021
parentPart of the code is copyright by Trolltech ASA. (diff)
downloadtgif-05140f342e1df7319dd3da2ef8157bfd5760fee6.tar.xz
sync-to-perforce is now called submit and fixed the gitdir check a little bit
Signed-off-by: Simon Hausmann <hausmann@kde.org>
-rwxr-xr-xcontrib/fast-import/git-p4.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/fast-import/git-p4.py b/contrib/fast-import/git-p4.py
index fa1b19fbbc..aca1bcaab2 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