diff options
Diffstat (limited to 'git_config.py')
-rw-r--r-- | git_config.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/git_config.py b/git_config.py index 380bdd24..aa07d1b7 100644 --- a/git_config.py +++ b/git_config.py | |||
@@ -216,9 +216,9 @@ class GitConfig(object): | |||
216 | """Resolve any url.*.insteadof references. | 216 | """Resolve any url.*.insteadof references. |
217 | """ | 217 | """ |
218 | for new_url in self.GetSubSections('url'): | 218 | for new_url in self.GetSubSections('url'): |
219 | old_url = self.GetString('url.%s.insteadof' % new_url) | 219 | for old_url in self.GetString('url.%s.insteadof' % new_url, True): |
220 | if old_url is not None and url.startswith(old_url): | 220 | if old_url is not None and url.startswith(old_url): |
221 | return new_url + url[len(old_url):] | 221 | return new_url + url[len(old_url):] |
222 | return url | 222 | return url |
223 | 223 | ||
224 | @property | 224 | @property |
@@ -697,7 +697,7 @@ class Branch(object): | |||
697 | self._Set('merge', self.merge) | 697 | self._Set('merge', self.merge) |
698 | 698 | ||
699 | else: | 699 | else: |
700 | fd = open(self._config.file, 'ab') | 700 | fd = open(self._config.file, 'a') |
701 | try: | 701 | try: |
702 | fd.write('[branch "%s"]\n' % self.name) | 702 | fd.write('[branch "%s"]\n' % self.name) |
703 | if self.remote: | 703 | if self.remote: |