replace "git repo-config" usage by "git config"

This is necessary since "git repo-config" will be removed soon.

Signed-off-by: Peter Oberndorfer <kumbayo84@arcor.de>
Signed-off-by: Karl Hasselström <kha@treskal.com>

diff --git a/stgit/config.py b/stgit/config.py
index 1d71cd2b787f687feb907c186fa6b62660b9ad2c..9bfdd52e29dd890ea989fbef50b0cb7c4e7757eb 100644 (file)
--- a/stgit/config.py
+++ b/stgit/config.py
@@ -47,7 +47,7 @@ class GitConfig:
         if self.__cache.has_key(name):
             return self.__cache[name]
         try:
         if self.__cache.has_key(name):
             return self.__cache[name]
         try:

-            value = Run('git', 'repo-config', '--get', name).output_one_line()
+            value = Run('git', 'config', '--get', name).output_one_line()

         except RunException:
             value = self.__defaults.get(name, None)
         self.__cache[name] = value
         except RunException:
             value = self.__defaults.get(name, None)
         self.__cache[name] = value


@@ -56,7 +56,7 @@ class GitConfig:
     def getall(self, name):
         if self.__cache.has_key(name):
             return self.__cache[name]
     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', 'config', '--get-all', name

                      ).returns([0, 1]).output_lines()
         self.__cache[name] = values
         return values
                      ).returns([0, 1]).output_lines()
         self.__cache[name] = values
         return values


@@ -71,23 +71,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."""
     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', '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."""
             ).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', 'config', '--remove-section', name

             ).returns([0, 1]).discard_stderr().discard_output()
         self.__cache.clear()
 
     def set(self, name, value):
             ).returns([0, 1]).discard_stderr().discard_output()
         self.__cache.clear()
 
     def set(self, name, value):

-        Run('git', 'repo-config', name, value).run()
+        Run('git', 'config', name, value).run()

         self.__cache[name] = value
 
     def unset(self, name):
         self.__cache[name] = value
 
     def unset(self, name):

-        Run('git', 'repo-config', '--unset', name)
+        Run('git', 'config', '--unset', name)

         self.__cache[name] = None
 
     def sections_matching(self, regexp):
         self.__cache[name] = None
 
     def sections_matching(self, regexp):


@@ -96,7 +96,7 @@ class GitConfig:
         group contents, for all variable names matching the regexp.
         """
         result = []
         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', 'config', '--get-regexp', '"^%s$"' % regexp

                         ).returns([0, 1]).output_lines():
             m = re.match('^%s ' % regexp, line)
             if m:
                         ).returns([0, 1]).output_lines():
             m = re.match('^%s ' % regexp, line)
             if m:

diff --git a/t/t1900-mail.sh b/t/t1900-mail.sh
index e83b2d3405a6b38836b1990417e875052b91a67f..cfdc6f36e770fb0e82cde3c9f1c85033f61700ee 100755 (executable)
--- a/t/t1900-mail.sh
+++ b/t/t1900-mail.sh
@@ -6,7 +6,7 @@ test_description='Test the mail command'
 test_expect_success \
     'Initialize the StGIT repository' \
     '
 test_expect_success \
     'Initialize the StGIT repository' \
     '

-    git repo-config stgit.sender "A U Thor <author@example.com>" &&
+    git config stgit.sender "A U Thor <author@example.com>" &&

     for i in 1 2 3 4 5; do
       touch foo.txt &&
       echo "line $i" >> foo.txt &&
     for i in 1 2 3 4 5; do
       touch foo.txt &&
       echo "line $i" >> foo.txt &&

diff --git a/t/t2100-pull-policy-fetch.sh b/t/t2100-pull-policy-fetch.sh
index 9e4bc31612deaeebb2572bed9ed2a51711f5c88a..670c7c6fe765038b0fb2d9f1b68a5dff8688dbd3 100755 (executable)
--- a/t/t2100-pull-policy-fetch.sh
+++ b/t/t2100-pull-policy-fetch.sh
@@ -19,8 +19,8 @@ test_expect_success \
     (cd upstream && stg init) &&
     stg clone upstream clone &&
     (cd clone &&
     (cd upstream && stg init) &&
     stg clone upstream clone &&
     (cd clone &&

-     git repo-config branch.master.stgit.pull-policy fetch-rebase &&
-     git repo-config --list &&
+     git config branch.master.stgit.pull-policy fetch-rebase &&
+     git config --list &&

      stg new c1 -m c1 &&
      echo a > file && git add file && stg refresh
     )
      stg new c1 -m c1 &&
      echo a > file && git add file && stg refresh
     )

diff --git a/t/t2101-pull-policy-pull.sh b/t/t2101-pull-policy-pull.sh
index b4521f0cd37a298c91f1271b4516dfe10f4b5199..ce4b5c89542623e3cdff6baaef14afa9c6617f4a 100755 (executable)
--- a/t/t2101-pull-policy-pull.sh
+++ b/t/t2101-pull-policy-pull.sh
@@ -19,8 +19,8 @@ test_expect_success \
     (cd upstream && stg init) &&
     stg clone upstream clone &&
     (cd clone &&
     (cd upstream && stg init) &&
     stg clone upstream clone &&
     (cd clone &&

-     git repo-config branch.master.stgit.pull-policy pull &&
-     git repo-config --list &&
+     git config branch.master.stgit.pull-policy pull &&
+     git config --list &&

      stg new c1 -m c1 &&
      echo a > file && git add file && stg refresh
     )
      stg new c1 -m c1 &&
      echo a > file && git add file && stg refresh
     )

diff --git a/t/t2102-pull-policy-rebase.sh b/t/t2102-pull-policy-rebase.sh
index 135b48cf6d5e326e39b80d52de25bb94b04be6fb..5619bda9f8ca2e03ee9d1995ecd9748691db5140 100755 (executable)
--- a/t/t2102-pull-policy-rebase.sh
+++ b/t/t2102-pull-policy-rebase.sh
@@ -13,8 +13,8 @@ test_expect_success \
     git branch -m master parent &&
     stg init &&
     stg branch --create stack &&
     git branch -m master parent &&
     stg init &&
     stg branch --create stack &&

-    git repo-config branch.stack.stgit.pull-policy rebase &&
-    git repo-config --list &&
+    git config branch.stack.stgit.pull-policy rebase &&
+    git config --list &&

     stg new c1 -m c1 &&
     echo a > file && git add file && stg refresh
     '
     stg new c1 -m c1 &&
     echo a > file && git add file && stg refresh
     '