diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-12 13:41:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-12 13:41:45 -0700 |
| commit | 6a293703afb10125fdff7a57a80e88298ac3f584 (patch) | |
| tree | 180bc2c3d504cce116e25ce7d80e52375e2b9d60 | |
| parent | 41ccfdd9c931ee71b09f38f4eb19cf44a8e4381d (diff) | |
| parent | c68c408a7a53736ae087a68ad0ce2cf7c4cab0a2 (diff) | |
| download | git-6a293703afb10125fdff7a57a80e88298ac3f584.tar.gz git-6a293703afb10125fdff7a57a80e88298ac3f584.tar.xz | |
Merge branch 'jc/t5516-pushInsteadOf-vs-pushURL' into maint
* jc/t5516-pushInsteadOf-vs-pushURL:
t5516: test interaction between pushURL and pushInsteadOf correctly
| -rwxr-xr-x | t/t5516-fetch-push.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh index c31e5c1c5..9a21cd61d 100755 --- a/t/t5516-fetch-push.sh +++ b/t/t5516-fetch-push.sh @@ -230,10 +230,10 @@ test_expect_success 'push with pushInsteadOf' ' test_expect_success 'push with pushInsteadOf and explicit pushurl (pushInsteadOf should not rewrite)' ' mk_empty && - TRASH="$(pwd)/" && - git config "url.trash2/.pushInsteadOf" trash/ && + git config "url.trash2/.pushInsteadOf" testrepo/ && + git config "url.trash3/.pusnInsteadOf" trash/wrong && git config remote.r.url trash/wrong && - git config remote.r.pushurl "$TRASH/testrepo" && + git config remote.r.pushurl "testrepo/" && git push r refs/heads/master:refs/remotes/origin/master && ( cd testrepo && |