diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-10-22 11:38:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-10-22 11:38:42 -0700 |
| commit | c4125fccb4c310b440ef6b0d4ed3c8cb651e1afa (patch) | |
| tree | d16eae7f6485892c92a03ed388bf4e3c616f8610 /t | |
| parent | 2ecb573bb3aa9b409e2a74d82bee560ef77b101b (diff) | |
| parent | 643f918d13906cbccdc5ad188767fc7895e30fc1 (diff) | |
| download | git-c4125fccb4c310b440ef6b0d4ed3c8cb651e1afa.tar.gz git-c4125fccb4c310b440ef6b0d4ed3c8cb651e1afa.tar.xz | |
Merge branch 'jk/clone-progress-to-stderr' into jc/upload-pack-send-symref
* 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 ccda6dfb4..f8e5a9a4a 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 7ff6e0e16..c4903687f 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 85cadfad6..9e24ec88e 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 ' |