commit a6d258b84d0d2fc0f995e6160ab4ccc7cb4c8396
author Conley Owens <cco3@android.com> Tue Jul 01 17:12:18 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 30 22:21:58 2014 +0000
tree 6a676c73db47d246afbc86d6d9bd5882e6d28fe7
parent a7694985683a36377841bb365c3a49551fe88a8d
parent 4e4d40f7c07ffe4f8988ee5c225bc897bfcf2206

Merge "Fix UrlInsteadOf to handle multiple strings"

git_config.py

diff --git a/git_config.py b/git_config.py
index 380bdd2..a667b3f 100644
--- a/git_config.py
+++ b/git_config.py
@@ -216,9 +216,9 @@
     """Resolve any url.*.insteadof references.
     """
     for new_url in self.GetSubSections('url'):
-      old_url = self.GetString('url.%s.insteadof' % new_url)
-      if old_url is not None and url.startswith(old_url):
-        return new_url + url[len(old_url):]
+      for old_url in self.GetString('url.%s.insteadof' % new_url, True):
+        if old_url is not None and url.startswith(old_url):
+          return new_url + url[len(old_url):]
     return url
 
   @property