diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-04-03 09:34:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-03 09:34:49 -0700 |
| commit | 41ae34d136e623cb4a6c6096d905dc648daabfb9 (patch) | |
| tree | 4ffd6d65c6f31bece4bbff4208f26a5981404bbb | |
| parent | Merge branch 'rs/submodule-summary-limit' (diff) | |
| parent | t5516: test interaction between pushURL and pushInsteadOf correctly (diff) | |
| download | tgif-41ae34d136e623cb4a6c6096d905dc648daabfb9.tar.xz | |
Merge branch 'jc/t5516-pushInsteadOf-vs-pushURL'
Update a test to match the documented interaction between pushURL
and pushInsteadOf.
* 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 383a2eb1ea..32ad89107b 100755 --- a/t/t5516-fetch-push.sh +++ b/t/t5516-fetch-push.sh @@ -217,10 +217,10 @@ test_expect_success 'push with pushInsteadOf' ' test_expect_success 'push with pushInsteadOf and explicit pushurl (pushInsteadOf should not rewrite)' ' mk_empty && - 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 && |