From: Karl Hasselström <kha@treskal.com>
Date: Fri, 17 Apr 2009 01:02:11 +0000 (+0200)
Subject: Newer gits return 128 when git config --{rename,remove}-section fails
X-Git-Tag: v0.15-rc1~24
X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/commitdiff_plain/a66b90722c0924f1bba120d268c8a1afa3a89868

Newer gits return 128 when git config --{rename,remove}-section fails

As of commit d64ec16c ("git config: reorganize to use parseopt"), git
config --rename-section and --remove-section will now call die()
instead of exit(1) when the section to be renamed or removed doesn't
exist, and die() calls exit(128). So we have to catch exit code 128 as
well.

Signed-off-by: Karl Hasselström <kha@treskal.com>
---

diff --git a/stgit/config.py b/stgit/config.py
index efce097..dbca5fb 100644
--- a/stgit/config.py
+++ b/stgit/config.py
@@ -73,14 +73,14 @@ class GitConfig:
         """Rename a section in the config file. Silently do nothing if
         the section doesn't exist."""
         Run('git', 'config', '--rename-section', from_name, to_name
-            ).returns([0, 1]).run()
+            ).returns([0, 1, 128]).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', 'config', '--remove-section', name
-            ).returns([0, 1]).discard_stderr().discard_output()
+            ).returns([0, 1, 128]).discard_stderr().discard_output()
         self.__cache.clear()
 
     def set(self, name, value):