diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-08-27 11:54:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-08-27 11:54:04 -0700 |
| commit | b9148c37637347cea7b448b57caeb2c58fe64979 (patch) | |
| tree | 7c56aa0659579c762f86fbc43ff2e7270b1170f5 /t/t5541-http-push.sh | |
| parent | efa646213a7d65955fbf897f57139ec3737d62f8 (diff) | |
| parent | f2c2c90103eaff6f39a289c15b9dbc06efaaf2a8 (diff) | |
| download | git-b9148c37637347cea7b448b57caeb2c58fe64979.tar.gz git-b9148c37637347cea7b448b57caeb2c58fe64979.tar.xz | |
Merge branch 'mm/push-default-switch-warning'
In the next major release, we will switch "git push [$there]" that
does not say what to push from the traditional "matching" to the
updated "simple" semantics, that pushes the current branch to the
branch with the same name only when the current branch is set to
integrate with that remote branch (all other cases will error out).
* mm/push-default-switch-warning:
push: start warning upcoming default change for push.default
Diffstat (limited to 't/t5541-http-push.sh')
| -rwxr-xr-x | t/t5541-http-push.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/t/t5541-http-push.sh b/t/t5541-http-push.sh index 312e48409..624633ace 100755 --- a/t/t5541-http-push.sh +++ b/t/t5541-http-push.sh @@ -64,7 +64,10 @@ test_expect_success 'no empty path components' ' test_expect_success 'clone remote repository' ' rm -rf test_repo_clone && - git clone $HTTPD_URL/smart/test_repo.git test_repo_clone + git clone $HTTPD_URL/smart/test_repo.git test_repo_clone && + ( + cd test_repo_clone && git config push.default matching + ) ' test_expect_success 'push to remote repository (standard)' ' |