From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 7 Apr 2013 21:32:50 +0000 (-0700)
Subject: Merge branch 'rr/triangle'
X-Git-Tag: v1.8.3-rc0~96
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4d35924e

Merge branch 'rr/triangle'

Support "pull from one place, push to another place" workflow
better by introducing remote.pushdefault (overrides the "origin"
thing) and branch.*.pushremote (overrides the branch.*.remote).

* rr/triangle:
remote.c: introduce branch.<name>.pushremote
remote.c: introduce remote.pushdefault
remote.c: introduce a way to have different remotes for fetch/push
t5516 (fetch-push): drop implicit arguments from helper functions
t5516 (fetch-push): update test description
remote.c: simplify a bit of code using git_config_string()
---

4d35924e3ac2e3022dd7595afe48334e7a794fb4
diff --cc t/t5516-fetch-push.sh
index 32ad89107b,7bf1555cac..838e71dafe
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@@ -216,11 -235,11 +235,11 @@@ test_expect_success 'push with pushInst
  '
  
  test_expect_success 'push with pushInsteadOf and explicit pushurl (pushInsteadOf should not rewrite)' '
- 	mk_empty &&
+ 	mk_empty testrepo &&
 -	TRASH="$(pwd)/" &&
 -	test_config "url.trash2/.pushInsteadOf" trash/ &&
 +	test_config "url.trash2/.pushInsteadOf" testrepo/ &&
 +	test_config "url.trash3/.pusnInsteadOf" trash/wrong &&
  	test_config remote.r.url trash/wrong &&
 -	test_config remote.r.pushurl "$TRASH/testrepo" &&
 +	test_config remote.r.pushurl "testrepo/" &&
  	git push r refs/heads/master:refs/remotes/origin/master &&
  	(
  		cd testrepo &&