kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'sg/t5516-fixes' 

Test fixes.

* sg/t5516-fixes:
  t5516-fetch-push: fix broken &&-chain
  t5516-fetch-push: fix 'push with dry-run' test
maint
Junio C Hamano 2018-05-23 14:38:12 +09:00
parent c4e7220f08 f6b82970aa
commit c8311980f9
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
t/t5516-fetch-push.sh
View File

@ -94,6 +94,9 @@ mk_child() {
} }


check_push_result () { check_push_result () {
test $# -ge 3 ||
error "bug in the test script: check_push_result requires at least 3 parameters"

repo_name="$1" repo_name="$1"
shift shift


@ -553,10 +556,7 @@ test_expect_success 'branch.*.pushremote config order is irrelevant' '
test_expect_success 'push with dry-run' ' test_expect_success 'push with dry-run' '


mk_test testrepo heads/master && mk_test testrepo heads/master &&
( old_commit=$(git -C testrepo show-ref -s --verify refs/heads/master) &&
cd testrepo &&
old_commit=$(git show-ref -s --verify refs/heads/master)
) &&
git push --dry-run testrepo : && git push --dry-run testrepo : &&
check_push_result testrepo $old_commit heads/master check_push_result testrepo $old_commit heads/master
' '
@ -612,7 +612,7 @@ test_expect_success 'push does not update local refs on failure' '
chmod +x testrepo/.git/hooks/pre-receive && chmod +x testrepo/.git/hooks/pre-receive &&
( (
cd child && cd child &&
git pull .. master git pull .. master &&
test_must_fail git push && test_must_fail git push &&
test $(git rev-parse master) != \ test $(git rev-parse master) != \
$(git rev-parse remotes/origin/master) $(git rev-parse remotes/origin/master)