X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/blobdiff_plain/e8813959aa3a7c41ffef61d06068b10519bd4830..1576d68145860b6d5b4fdaec3e130941a2d6c6fb:/stgit/config.py

diff --git a/stgit/config.py b/stgit/config.py
index 3eabc8c..61f91b0 100644
--- a/stgit/config.py
+++ b/stgit/config.py
@@ -31,8 +31,8 @@ class GitConfig:
         'stgit.autoresolved':	'no',
         'stgit.smtpserver':	'localhost:25',
         'stgit.smtpdelay':	'5',
-        'stgit.pullcmd':	'git-pull',
-        'stgit.fetchcmd':	'git-fetch',
+        'stgit.pullcmd':	'git pull',
+        'stgit.fetchcmd':	'git fetch',
         'stgit.pull-policy':	'pull',
         'stgit.merger':		'diff3 -L current -L ancestor -L patched -m -E ' \
 				'"%(branch1)s" "%(ancestor)s" "%(branch2)s" > "%(output)s"',
@@ -49,7 +49,7 @@ class GitConfig:
         if self.__cache.has_key(name):
             return self.__cache[name]
         try:
-            value = Run('git-repo-config', '--get', name).output_one_line()
+            value = Run('git', 'repo-config', '--get', name).output_one_line()
         except RunException:
             value = self.__defaults.get(name, None)
         self.__cache[name] = value
@@ -58,7 +58,7 @@ class GitConfig:
     def getall(self, name):
         if self.__cache.has_key(name):
             return self.__cache[name]
-        values = Run('git-repo-config', '--get-all', name
+        values = Run('git', 'repo-config', '--get-all', name
                      ).returns([0, 1]).output_lines()
         self.__cache[name] = values
         return values
@@ -73,23 +73,23 @@ class GitConfig:
     def rename_section(self, from_name, to_name):
         """Rename a section in the config file. Silently do nothing if
         the section doesn't exist."""
-        Run('git-repo-config', '--rename-section', from_name, to_name
+        Run('git', 'repo-config', '--rename-section', from_name, to_name
             ).returns([0, 1]).run()
         self.__cache.clear()
 
     def remove_section(self, name):
         """Remove a section in the config file. Silently do nothing if
         the section doesn't exist."""
-        Run('git-repo-config', '--remove-section', name
+        Run('git', 'repo-config', '--remove-section', name
             ).returns([0, 1]).discard_stderr().discard_output()
         self.__cache.clear()
 
     def set(self, name, value):
-        Run('git-repo-config', name, value).run()
+        Run('git', 'repo-config', name, value).run()
         self.__cache[name] = value
 
     def unset(self, name):
-        Run('git-repo-config', '--unset', name)
+        Run('git', 'repo-config', '--unset', name)
         self.__cache[name] = None
 
     def sections_matching(self, regexp):
@@ -98,7 +98,7 @@ class GitConfig:
         group contents, for all variable names matching the regexp.
         """
         result = []
-        for line in Run('git-repo-config', '--get-regexp', '"^%s$"' % regexp
+        for line in Run('git', 'repo-config', '--get-regexp', '"^%s$"' % regexp
                         ).returns([0, 1]).output_lines():
             m = re.match('^%s ' % regexp, line)
             if m: