Merge branch 'ew/connect-verbose'
* ew/connect-verbose: t5570: add tests for "git {clone,fetch,pull} -v"
This commit is contained in:
commit
d7145ef275
@ -6,6 +6,12 @@ test_description='test fetching over git protocol'
|
|||||||
. "$TEST_DIRECTORY"/lib-git-daemon.sh
|
. "$TEST_DIRECTORY"/lib-git-daemon.sh
|
||||||
start_git_daemon
|
start_git_daemon
|
||||||
|
|
||||||
|
check_verbose_connect () {
|
||||||
|
grep -F "Looking up 127.0.0.1 ..." stderr &&
|
||||||
|
grep -F "Connecting to 127.0.0.1 (port " stderr &&
|
||||||
|
grep -F "done." stderr
|
||||||
|
}
|
||||||
|
|
||||||
test_expect_success 'setup repository' '
|
test_expect_success 'setup repository' '
|
||||||
git config push.default matching &&
|
git config push.default matching &&
|
||||||
echo content >file &&
|
echo content >file &&
|
||||||
@ -24,7 +30,8 @@ test_expect_success 'create git-accessible bare repository' '
|
|||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success 'clone git repository' '
|
test_expect_success 'clone git repository' '
|
||||||
git clone "$GIT_DAEMON_URL/repo.git" clone &&
|
git clone -v "$GIT_DAEMON_URL/repo.git" clone 2>stderr &&
|
||||||
|
check_verbose_connect &&
|
||||||
test_cmp file clone/file
|
test_cmp file clone/file
|
||||||
'
|
'
|
||||||
|
|
||||||
@ -32,10 +39,21 @@ test_expect_success 'fetch changes via git protocol' '
|
|||||||
echo content >>file &&
|
echo content >>file &&
|
||||||
git commit -a -m two &&
|
git commit -a -m two &&
|
||||||
git push public &&
|
git push public &&
|
||||||
(cd clone && git pull) &&
|
(cd clone && git pull -v) 2>stderr &&
|
||||||
|
check_verbose_connect &&
|
||||||
test_cmp file clone/file
|
test_cmp file clone/file
|
||||||
'
|
'
|
||||||
|
|
||||||
|
test_expect_success 'no-op fetch -v stderr is as expected' '
|
||||||
|
(cd clone && git fetch -v) 2>stderr &&
|
||||||
|
check_verbose_connect
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success 'no-op fetch without "-v" is quiet' '
|
||||||
|
(cd clone && git fetch) 2>stderr &&
|
||||||
|
! test -s stderr
|
||||||
|
'
|
||||||
|
|
||||||
test_expect_success 'remote detects correct HEAD' '
|
test_expect_success 'remote detects correct HEAD' '
|
||||||
git push public master:other &&
|
git push public master:other &&
|
||||||
(cd clone &&
|
(cd clone &&
|
||||||
|
Loading…
Reference in New Issue
Block a user