Merge branch 'stable'

* stable:
  stgit.namelength is an integer
  Return None instead of crashing on undefined integer config items

diff --git a/stgit/config.py b/stgit/config.py
index 9bfdd52e29dd890ea989fbef50b0cb7c4e7757eb..05ef624f41b4486d667958e9e8f7c9b91d01a86e 100644 (file)
--- a/stgit/config.py
+++ b/stgit/config.py
@@ -63,7 +63,9 @@ class GitConfig:
 
     def getint(self, name):
         value = self.get(name)
-        if value.isdigit():
+        if value == None:
+            return None
+        elif value.isdigit():
             return int(value)
         else:
             raise GitConfigException, 'Value for "%s" is not an integer: "%s"' % (name, value)

diff --git a/stgit/utils.py b/stgit/utils.py
index 81035a59b97189fdddc0d817c6ffdac694f1da10..1fa96c252f3af6646229a931668621e4e44524f6 100644 (file)
--- a/stgit/utils.py
+++ b/stgit/utils.py
@@ -215,7 +215,7 @@ def patch_name_from_msg(msg):
     if not msg:
         return None
 
-    name_len = config.get('stgit.namelength')
+    name_len = config.getint('stgit.namelength')
     if not name_len:
         name_len = 30