From c2282fb5e00218c4a92b9bcba41d58e9b212fedd Mon Sep 17 00:00:00 2001 From: Richard Maw Date: Tue, 22 May 2012 15:10:16 +0100 Subject: 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. --- morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'morph') 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], -- cgit v1.2.1