mirror of
https://github.com/git/git
synced 2024-10-30 14:03:28 +00:00
6789275d37
They are equivalents and the former still exists, so as long as the
only change this commit makes are to rewrite test_i18ngrep to
test_grep, there won't be any new bug, even if there still are
callers of test_i18ngrep remaining in the tree, or when merged to
other topics that add new uses of test_i18ngrep.
This patch was produced more or less with
git grep -l -e 'test_i18ngrep ' 't/t[0-9][0-9][0-9][0-9]-*.sh' |
xargs perl -p -i -e 's/test_i18ngrep /test_grep /'
and a good way to sanity check the result yourself is to run the
above in a checkout of c4603c1c (test framework: further deprecate
test_i18ngrep, 2023-10-31) and compare the resulting working tree
contents with the result of applying this patch to the same commit.
You'll see that test_i18ngrep in a few t/lib-*.sh files corrected,
in addition to the manual reproduction.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
138 lines
3.5 KiB
Bash
Executable file
138 lines
3.5 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='push with --set-upstream'
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./test-lib.sh
|
|
. "$TEST_DIRECTORY"/lib-terminal.sh
|
|
|
|
ensure_fresh_upstream() {
|
|
rm -rf parent && git init --bare parent
|
|
}
|
|
|
|
test_expect_success 'setup bare parent' '
|
|
ensure_fresh_upstream &&
|
|
git remote add upstream parent
|
|
'
|
|
|
|
test_expect_success 'setup local commit' '
|
|
echo content >file &&
|
|
git add file &&
|
|
git commit -m one
|
|
'
|
|
|
|
check_config() {
|
|
(echo $2; echo $3) >expect.$1
|
|
(git config branch.$1.remote
|
|
git config branch.$1.merge) >actual.$1
|
|
test_cmp expect.$1 actual.$1
|
|
}
|
|
|
|
test_expect_success 'push -u main:main' '
|
|
git push -u upstream main:main &&
|
|
check_config main upstream refs/heads/main
|
|
'
|
|
|
|
test_expect_success 'push -u main:other' '
|
|
git push -u upstream main:other &&
|
|
check_config main upstream refs/heads/other
|
|
'
|
|
|
|
test_expect_success 'push -u --dry-run main:otherX' '
|
|
git push -u --dry-run upstream main:otherX &&
|
|
check_config main upstream refs/heads/other
|
|
'
|
|
|
|
test_expect_success 'push -u topic_2:topic_2' '
|
|
git branch topic_2 &&
|
|
git push -u upstream topic_2:topic_2 &&
|
|
check_config topic_2 upstream refs/heads/topic_2
|
|
'
|
|
|
|
test_expect_success 'push -u topic_2:other2' '
|
|
git push -u upstream topic_2:other2 &&
|
|
check_config topic_2 upstream refs/heads/other2
|
|
'
|
|
|
|
test_expect_success 'push -u :topic_2' '
|
|
git push -u upstream :topic_2 &&
|
|
check_config topic_2 upstream refs/heads/other2
|
|
'
|
|
|
|
test_expect_success 'push -u --all(the same behavior with--branches)' '
|
|
git branch all1 &&
|
|
git branch all2 &&
|
|
git push -u --all &&
|
|
check_config all1 upstream refs/heads/all1 &&
|
|
check_config all2 upstream refs/heads/all2 &&
|
|
git config --get-regexp branch.all* > expect &&
|
|
git config --remove-section branch.all1 &&
|
|
git config --remove-section branch.all2 &&
|
|
git push -u --branches &&
|
|
check_config all1 upstream refs/heads/all1 &&
|
|
check_config all2 upstream refs/heads/all2 &&
|
|
git config --get-regexp branch.all* > actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'push -u HEAD' '
|
|
git checkout -b headbranch &&
|
|
git push -u upstream HEAD &&
|
|
check_config headbranch upstream refs/heads/headbranch
|
|
'
|
|
|
|
test_expect_success TTY 'progress messages go to tty' '
|
|
ensure_fresh_upstream &&
|
|
|
|
test_terminal git push -u upstream main >out 2>err &&
|
|
test_grep "Writing objects" err
|
|
'
|
|
|
|
test_expect_success 'progress messages do not go to non-tty' '
|
|
ensure_fresh_upstream &&
|
|
|
|
# skip progress messages, since stderr is non-tty
|
|
git push -u upstream main >out 2>err &&
|
|
test_grep ! "Writing objects" err
|
|
'
|
|
|
|
test_expect_success 'progress messages go to non-tty (forced)' '
|
|
ensure_fresh_upstream &&
|
|
|
|
# force progress messages to stderr, even though it is non-tty
|
|
git push -u --progress upstream main >out 2>err &&
|
|
test_grep "Writing objects" err
|
|
'
|
|
|
|
test_expect_success TTY 'push -q suppresses progress' '
|
|
ensure_fresh_upstream &&
|
|
|
|
test_terminal git push -u -q upstream main >out 2>err &&
|
|
test_grep ! "Writing objects" err
|
|
'
|
|
|
|
test_expect_success TTY 'push --no-progress suppresses progress' '
|
|
ensure_fresh_upstream &&
|
|
|
|
test_terminal git push -u --no-progress upstream main >out 2>err &&
|
|
test_grep ! "Unpacking objects" err &&
|
|
test_grep ! "Writing objects" err
|
|
'
|
|
|
|
test_expect_success TTY 'quiet push' '
|
|
ensure_fresh_upstream &&
|
|
|
|
test_terminal git push --quiet --no-progress upstream main 2>&1 | tee output &&
|
|
test_must_be_empty output
|
|
'
|
|
|
|
test_expect_success TTY 'quiet push -u' '
|
|
ensure_fresh_upstream &&
|
|
|
|
test_terminal git push --quiet -u --no-progress upstream main 2>&1 | tee output &&
|
|
test_must_be_empty output
|
|
'
|
|
|
|
test_done
|