diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-10-28 10:19:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-10-28 10:19:24 -0700 |
| commit | df1ef917c6d7c8db99ab3fe99ebe35ed96a5d25a (patch) | |
| tree | 09713fc37e25ea36e51e837745b8ec1a95255ef9 /t | |
| parent | da212eabec969f0a45475b6a962b06c103a3ec65 (diff) | |
| parent | 643f918d13906cbccdc5ad188767fc7895e30fc1 (diff) | |
| download | git-df1ef917c6d7c8db99ab3fe99ebe35ed96a5d25a.tar.gz | |
Merge branch 'jk/clone-progress-to-stderr' into maint
"git clone" gave some progress messages to the standard output, not to
the standard error, and did not allow suppressing them with the
"--no-progress" option.
* jk/clone-progress-to-stderr:
clone: always set transport options
clone: treat "checking connectivity" like other progress
clone: send diagnostic messages to stderr
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5601-clone.sh | 2 | ||||
| -rwxr-xr-x | t/t5701-clone-local.sh | 4 | ||||
| -rwxr-xr-x | t/t5702-clone-options.sh | 10 |
3 files changed, 11 insertions, 5 deletions
diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh index 0629149edd..b3b11e61c0 100755 --- a/t/t5601-clone.sh +++ b/t/t5601-clone.sh @@ -36,7 +36,7 @@ test_expect_success 'clone with excess parameters (2)' ' test_expect_success C_LOCALE_OUTPUT 'output from clone' ' rm -fr dst && - git clone -n "file://$(pwd)/src" dst >output && + git clone -n "file://$(pwd)/src" dst >output 2>&1 && test $(grep Clon output | wc -l) = 1 ' diff --git a/t/t5701-clone-local.sh b/t/t5701-clone-local.sh index 7ff6e0e16c..c4903687fb 100755 --- a/t/t5701-clone-local.sh +++ b/t/t5701-clone-local.sh @@ -134,4 +134,8 @@ test_expect_success 'cloning a local path with --no-local does not hardlink' ' ! repo_is_hardlinked force-nonlocal ' +test_expect_success 'cloning locally respects "-u" for fetching refs' ' + test_must_fail git clone --bare -u false a should_not_work.git +' + test_done diff --git a/t/t5702-clone-options.sh b/t/t5702-clone-options.sh index 85cadfad6d..9e24ec88e6 100755 --- a/t/t5702-clone-options.sh +++ b/t/t5702-clone-options.sh @@ -19,17 +19,19 @@ test_expect_success 'clone -o' ' ' -test_expect_success 'redirected clone' ' +test_expect_success 'redirected clone does not show progress' ' git clone "file://$(pwd)/parent" clone-redirected >out 2>err && - test_must_be_empty err + ! grep % err && + test_i18ngrep ! "Checking connectivity" err ' -test_expect_success 'redirected clone -v' ' + +test_expect_success 'redirected clone -v does show progress' ' git clone --progress "file://$(pwd)/parent" clone-redirected-progress \ >out 2>err && - test -s err + grep % err ' |