Merge commit 'kha/safe'

diff --git a/stgit/commands/repair.py b/stgit/commands/repair.py
index 37c4bab1d0cbd350deb919f73ca6b9b7f3c89eba..5804a12f8b9ea60145caae05278ecdd33b104865 100644 (file)
--- a/stgit/commands/repair.py
+++ b/stgit/commands/repair.py
@@ -108,7 +108,7 @@ def read_commit_dag(branch):
             commits[id].children.add(commits[cs[0]])
     for line in Run('git', 'show-ref').output_lines():
         id, ref = line.split()
-        m = re.match(r'^refs/patches/%s/(.+)$' % branch, ref)
+        m = re.match(r'^refs/patches/%s/(.+)$' % re.escape(branch), ref)
         if m and not m.group(1).endswith('.log'):
             c = commits[id]
             c.patch = m.group(1)