morph branching: use git-config to set pushInsteadOf

This is the standard way of altering config, it shouldn't be done
by modifying the config file.
This may allow better forward compatibility if the config keys or
storage format change.

1 files changed, 3 insertions, 5 deletions

diff --git a/morphlib/app.py b/morphlib/app.py
index a8cad8a2..e1554951 100755
--- a/morphlib/app.py
+++ b/morphlib/app.py
@@ -806,11 +806,9 @@ class Morph(cliapp.Application):
         morphlib.git.set_remote(self.runcmd, dirname, 'origin', repo.url)
         
         # Add push url rewrite rule to .git/config.
-        filename = os.path.join(dirname, '.git', 'config')
-        with open(filename, 'a') as f:
-            f.write('\n')
-            f.write('[url "%s"]\n' % repo_resolver.push_url(reponame))
-            f.write('\tpushInsteadOf = %s\n' %repo_resolver.pull_url(reponame))
+        self.runcmd(['git', 'config',
+                     'url.%s.pushInsteadOf'% repo_resolver.push_url(reponame),
+                     repo_resolver.pull_url(reponame)], cwd=dirname)
         
         # Update remotes.
         self.runcmd(['git', 'remote', 'update'], cwd=dirname)