development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-28 03:59:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

t5570: use explicit push refspec

Browse source 
The default mode for push without arguments will change. Some warnings
are about to be enabled for such use, which causes some t5570 tests to
fail because they do not expect this output.

Fix this by passing an explicit refspec to git push. To that end, change
the calling conventions of test_remote_error in order to accomodate
extra command arguments.

Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Clemens Buchacher 2012-04-24 09:50:04 +02:00 committed by Junio C Hamano
parent b55e677522
commit aecff47da6
1 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
t/t5570-git-daemon.sh
View file

@ -103,14 +103,12 @@ test_remote_error()
esac esac
done done
if test $# -ne 3 msg=$1
then shift
error "invalid number of arguments"
fi
cmd=$1 cmd=$1
repo=$2 shift
msg=$3 repo=$1
shift || error "invalid number of arguments"
if test -x "$GIT_DAEMON_DOCUMENT_ROOT_PATH/$repo" if test -x "$GIT_DAEMON_DOCUMENT_ROOT_PATH/$repo"
then then
@ -122,7 +120,7 @@ test_remote_error()
fi fi
fi fi
test_must_fail git "$cmd" "$GIT_DAEMON_URL/$repo" 2>output && test_must_fail git "$cmd" "$GIT_DAEMON_URL/$repo" "$@" 2>output &&
echo "fatal: remote error: $msg: /$repo" >expect && echo "fatal: remote error: $msg: /$repo" >expect &&
test_cmp expect output test_cmp expect output
ret=$? ret=$?
@ -131,18 +129,18 @@ test_remote_error()
} }
msg="access denied or repository not exported" msg="access denied or repository not exported"
test_expect_success 'clone non-existent' "test_remote_error clone nowhere.git '$msg'" test_expect_success 'clone non-existent' "test_remote_error '$msg' clone nowhere.git "
test_expect_success 'push disabled' "test_remote_error push repo.git '$msg'" test_expect_success 'push disabled' "test_remote_error '$msg' push repo.git master"
test_expect_success 'read access denied' "test_remote_error -x fetch repo.git '$msg'" test_expect_success 'read access denied' "test_remote_error -x '$msg' fetch repo.git "
test_expect_success 'not exported' "test_remote_error -n fetch repo.git '$msg'" test_expect_success 'not exported' "test_remote_error -n '$msg' fetch repo.git "
stop_git_daemon stop_git_daemon
start_git_daemon --informative-errors start_git_daemon --informative-errors
test_expect_success 'clone non-existent' "test_remote_error clone nowhere.git 'no such repository'" test_expect_success 'clone non-existent' "test_remote_error 'no such repository' clone nowhere.git "
test_expect_success 'push disabled' "test_remote_error push repo.git 'service not enabled'" test_expect_success 'push disabled' "test_remote_error 'service not enabled' push repo.git master"
test_expect_success 'read access denied' "test_remote_error -x fetch repo.git 'no such repository'" test_expect_success 'read access denied' "test_remote_error -x 'no such repository' fetch repo.git "
test_expect_success 'not exported' "test_remote_error -n fetch repo.git 'repository not exported'" test_expect_success 'not exported' "test_remote_error -n 'repository not exported' fetch repo.git "
stop_git_daemon stop_git_daemon
test_done test_done