diff options
| author | Eric Sunshine <sunshine@sunshineco.com> | 2018-07-02 00:24:01 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-16 21:38:47 (GMT) |
| commit | 51b85471af1d2df88749e8a7aa424a879e33a9d7 (patch) | |
| tree | aaaffc3d661ac6e36e713d09bc057551ae32b3c7 /t/t5516-fetch-push.sh | |
| parent | f957f03b60163ffdc346cce44a67b0347a51190b (diff) | |
| download | git-51b85471af1d2df88749e8a7aa424a879e33a9d7.zip git-51b85471af1d2df88749e8a7aa424a879e33a9d7.tar.gz git-51b85471af1d2df88749e8a7aa424a879e33a9d7.tar.bz2 | |
t5000-t5999: fix broken &&-chains
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5516-fetch-push.sh')
| -rwxr-xr-x | t/t5516-fetch-push.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh index a5077d8..bd8f23e 100755 --- a/t/t5516-fetch-push.sh +++ b/t/t5516-fetch-push.sh @@ -923,7 +923,7 @@ test_expect_success 'push into aliased refs (consistent)' ' ( cd child1 && git branch foo && - git symbolic-ref refs/heads/bar refs/heads/foo + git symbolic-ref refs/heads/bar refs/heads/foo && git config receive.denyCurrentBranch false ) && ( @@ -945,7 +945,7 @@ test_expect_success 'push into aliased refs (inconsistent)' ' ( cd child1 && git branch foo && - git symbolic-ref refs/heads/bar refs/heads/foo + git symbolic-ref refs/heads/bar refs/heads/foo && git config receive.denyCurrentBranch false ) && ( @@ -1011,7 +1011,7 @@ test_expect_success 'push --porcelain rejected' ' mk_empty testrepo && git push testrepo refs/heads/master:refs/remotes/origin/master && (cd testrepo && - git reset --hard origin/master^ + git reset --hard origin/master^ && git config receive.denyCurrentBranch true) && echo >.git/foo "To testrepo" && @@ -1025,7 +1025,7 @@ test_expect_success 'push --porcelain --dry-run rejected' ' mk_empty testrepo && git push testrepo refs/heads/master:refs/remotes/origin/master && (cd testrepo && - git reset --hard origin/master + git reset --hard origin/master && git config receive.denyCurrentBranch true) && echo >.git/foo "To testrepo" && @@ -1333,7 +1333,7 @@ test_expect_success 'push --follow-tag only pushes relevant tags' ' git commit --allow-empty -m "future commit" && git tag -m "future" future && git checkout master && - git for-each-ref refs/heads/master refs/tags/tag >../expect + git for-each-ref refs/heads/master refs/tags/tag >../expect && git push --follow-tag ../dst master ) && ( |