summaryrefslogtreecommitdiff
path: root/morph
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2012-05-22 15:10:16 +0100
committerRichard Maw <richard.maw@codethink.co.uk>2012-05-22 15:10:16 +0100
commitc2282fb5e00218c4a92b9bcba41d58e9b212fedd (patch)
tree59374ae40c39bdd7fa2f8650259d0b9aa354eb49 /morph
parentaa1ae3333d723b7bf91beab4f357c1cb99ecf742 (diff)
downloadmorph-c2282fb5e00218c4a92b9bcba41d58e9b212fedd.tar.gz
morph: fix morph edit pushInsteadOf urls
_clone_to_directory uses the alias to get the push and pull urls. However `repo` is an already resolved url, so it does not contain the alias, so pass the arg it is resolved from.
Diffstat (limited to 'morph')
-rwxr-xr-xmorph4
1 files changed, 2 insertions, 2 deletions
diff --git a/morph b/morph
index 1304a2b1..01f38248 100755
--- a/morph
+++ b/morph
@@ -640,7 +640,7 @@ class Morph(cliapp.Application):
with open(filename, 'a') as f:
f.write('\n')
f.write('[url "%s"]\n' % repo_resolver.push_url(reponame))
- f.write('pushInsteadOf = %s\n' % repo_resolver.pull_url(reponame))
+ f.write('\tpushInsteadOf = %s\n' % repo_resolver.pull_url(reponame))
# Update remotes.
self.runcmd(['git', 'remote', 'update'], cwd=dirname)
@@ -736,7 +736,7 @@ class Morph(cliapp.Application):
new_repo = os.path.join(mine_directory, system_branch,
os.path.basename(repo))
- self._clone_to_directory(new_repo, repo, ref)
+ self._clone_to_directory(new_repo, args[0], ref)
if system_branch == ref:
self.runcmd(['git', 'checkout', system_branch],