X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-p4import.py;h=0f3d97b67eef3108728265e26f5d79c4526d11ac;hb=689b4d552b8108d2c92c63258990ecd2bc791739;hp=908941dd77007e71f5aa036bb190a14d628050c8;hpb=659db3f673fe199bad6ce9cc625d3a1b098bfbcf;p=git.git diff --git a/git-p4import.py b/git-p4import.py index 908941dd7..0f3d97b67 100644 --- a/git-p4import.py +++ b/git-p4import.py @@ -163,7 +163,7 @@ class git_command: self.gitdir = self.get_single("rev-parse --git-dir") report(2, "gdir:", self.gitdir) except: - die("Not a git repository... did you forget to \"git init-db\" ?") + die("Not a git repository... did you forget to \"git init\" ?") try: self.cdup = self.get_single("rev-parse --show-cdup") if self.cdup != "": @@ -193,13 +193,13 @@ class git_command: def get_config(self, variable): try: - return self.git("repo-config --get %s" % variable)[0].rstrip() + return self.git("config --get %s" % variable)[0].rstrip() except: return None def set_config(self, variable, value): try: - self.git("repo-config %s %s"%(variable, value) ) + self.git("config %s %s"%(variable, value) ) except: die("Could not set %s to " % variable, value) @@ -358,4 +358,3 @@ for id in changes: if stitch == 1: git.clean_directories() stitch = 0 -