summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiang Xin <zhiyou.jx@alibaba-inc.com>2022-11-21 13:40:40 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-11-22 00:16:30 (GMT)
commit288fcb1c942d582b915a4c824c6b87a94ae875a7 (patch)
tree2afca3707cf60448bfe48abd2a05cf98283868c2
parent82f67ee13fb25ebed1cd722c83de49a1ac588429 (diff)
downloadgit-288fcb1c942d582b915a4c824c6b87a94ae875a7.zip
git-288fcb1c942d582b915a4c824c6b87a94ae875a7.tar.gz
git-288fcb1c942d582b915a4c824c6b87a94ae875a7.tar.bz2
t5516: fail to run in verbose mode
The test case "push with config push.useBitmap" of t5516 was introduced in commit 82f67ee13f (send-pack.c: add config push.useBitmaps, 2022-06-17). It won't work in verbose mode, e.g.: $ sh t5516-fetch-push.sh --run='1,115' -v This is because "git-push" will run in a tty in this case, and the subcommand "git pack-objects" will contain an argument "--progress" instead of "-q". Adding a specific option "--quiet" to "git push" will get a stable result for t5516. Signed-off-by: Jiang Xin <zhiyou.jx@alibaba-inc.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t5516-fetch-push.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index b3734dd..f432031 100755
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@ -1870,19 +1870,19 @@ test_expect_success 'push with config push.useBitmaps' '
git checkout main &&
test_unconfig push.useBitmaps &&
GIT_TRACE2_EVENT="$PWD/default" \
- git push testrepo main:test &&
+ git push --quiet testrepo main:test &&
test_subcommand git pack-objects --all-progress-implied --revs --stdout \
--thin --delta-base-offset -q <default &&
test_config push.useBitmaps true &&
GIT_TRACE2_EVENT="$PWD/true" \
- git push testrepo main:test2 &&
+ git push --quiet testrepo main:test2 &&
test_subcommand git pack-objects --all-progress-implied --revs --stdout \
--thin --delta-base-offset -q <true &&
test_config push.useBitmaps false &&
GIT_TRACE2_EVENT="$PWD/false" \
- git push testrepo main:test3 &&
+ git push --quiet testrepo main:test3 &&
test_subcommand git pack-objects --all-progress-implied --revs --stdout \
--thin --delta-base-offset -q --no-use-bitmap-index <false
'