undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t5528-push-default.sh: add helper functions

Browse Source 
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Matthieu Moy 2012-04-24 09:50:02 +02:00 committed by Junio C Hamano
parent 628ab0ea10
commit 321e75c5dc
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
t/t5528-push-default.sh
View File

@ -13,16 +13,36 @@ test_expect_success 'setup bare remotes' '
git push parent2 HEAD git push parent2 HEAD
' '
# $1 = local revision
# $2 = remote revision (tested to be equal to the local one)
check_pushed_commit () {
git log -1 --format='%h %s' "$1" >expect &&
git --git-dir=repo1 log -1 --format='%h %s' "$2" >actual &&
test_cmp expect actual
}
# $1 = push.default value
# $2 = expected target branch for the push
test_push_success () {
git -c push.default="$1" push &&
check_pushed_commit HEAD "$2"
}
# $1 = push.default value
# check that push fails and does not modify any remote branch
test_push_failure () {
git --git-dir=repo1 log --no-walk --format='%h %s' --all >expect &&
test_must_fail git -c push.default="$1" push &&
git --git-dir=repo1 log --no-walk --format='%h %s' --all >actual &&
test_cmp expect actual
}
test_expect_success '"upstream" pushes to configured upstream' ' test_expect_success '"upstream" pushes to configured upstream' '
git checkout master && git checkout master &&
test_config branch.master.remote parent1 && test_config branch.master.remote parent1 &&
test_config branch.master.merge refs/heads/foo && test_config branch.master.merge refs/heads/foo &&
test_config push.default upstream &&
test_commit two && test_commit two &&
git push && test_push_success upstream foo
echo two >expect &&
git --git-dir=repo1 log -1 --format=%s foo >actual &&
test_cmp expect actual
' '
test_expect_success '"upstream" does not push on unconfigured remote' ' test_expect_success '"upstream" does not push on unconfigured remote' '
@ -30,7 +50,7 @@ test_expect_success '"upstream" does not push on unconfigured remote' '
test_unconfig branch.master.remote && test_unconfig branch.master.remote &&
test_config push.default upstream && test_config push.default upstream &&
test_commit three && test_commit three &&
test_must_fail git push test_push_failure upstream
' '
test_expect_success '"upstream" does not push on unconfigured branch' ' test_expect_success '"upstream" does not push on unconfigured branch' '
@ -39,7 +59,7 @@ test_expect_success '"upstream" does not push on unconfigured branch' '
test_unconfig branch.master.merge && test_unconfig branch.master.merge &&
test_config push.default upstream test_config push.default upstream
test_commit four && test_commit four &&
test_must_fail git push test_push_failure upstream
' '
test_expect_success '"upstream" does not push when remotes do not match' ' test_expect_success '"upstream" does not push when remotes do not match' '