merge-recursive: fix longstanding bug in merging symlinks

diff --git a/git-p4import.py b/git-p4import.py
index 908941dd77007e71f5aa036bb190a14d628050c8..60a758bfe3bf535733612d4a0843fb42055f4c80 100644 (file)
--- a/git-p4import.py
+++ b/git-p4import.py
@@ -163,7 +163,7 @@ def __init__(self):
             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 @@ def current_branch(self):
 
     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)