2010-01-16 21:45:31 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
test_description='push with --set-upstream'
|
2020-11-18 23:44:33 +00:00
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
tests: mark tests relying on the current default for `init.defaultBranch`
In addition to the manual adjustment to let the `linux-gcc` CI job run
the test suite with `master` and then with `main`, this patch makes sure
that GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME is set in all test scripts
that currently rely on the initial branch name being `master by default.
To determine which test scripts to mark up, the first step was to
force-set the default branch name to `master` in
- all test scripts that contain the keyword `master`,
- t4211, which expects `t/t4211/history.export` with a hard-coded ref to
initialize the default branch,
- t5560 because it sources `t/t556x_common` which uses `master`,
- t8002 and t8012 because both source `t/annotate-tests.sh` which also
uses `master`)
This trick was performed by this command:
$ sed -i '/^ *\. \.\/\(test-lib\|lib-\(bash\|cvs\|git-svn\)\|gitweb-lib\)\.sh$/i\
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\
' $(git grep -l master t/t[0-9]*.sh) \
t/t4211*.sh t/t5560*.sh t/t8002*.sh t/t8012*.sh
After that, careful, manual inspection revealed that some of the test
scripts containing the needle `master` do not actually rely on a
specific default branch name: either they mention `master` only in a
comment, or they initialize that branch specificially, or they do not
actually refer to the current default branch. Therefore, the
aforementioned modification was undone in those test scripts thusly:
$ git checkout HEAD -- \
t/t0027-auto-crlf.sh t/t0060-path-utils.sh \
t/t1011-read-tree-sparse-checkout.sh \
t/t1305-config-include.sh t/t1309-early-config.sh \
t/t1402-check-ref-format.sh t/t1450-fsck.sh \
t/t2024-checkout-dwim.sh \
t/t2106-update-index-assume-unchanged.sh \
t/t3040-subprojects-basic.sh t/t3301-notes.sh \
t/t3308-notes-merge.sh t/t3423-rebase-reword.sh \
t/t3436-rebase-more-options.sh \
t/t4015-diff-whitespace.sh t/t4257-am-interactive.sh \
t/t5323-pack-redundant.sh t/t5401-update-hooks.sh \
t/t5511-refspec.sh t/t5526-fetch-submodules.sh \
t/t5529-push-errors.sh t/t5530-upload-pack-error.sh \
t/t5548-push-porcelain.sh \
t/t5552-skipping-fetch-negotiator.sh \
t/t5572-pull-submodule.sh t/t5608-clone-2gb.sh \
t/t5614-clone-submodules-shallow.sh \
t/t7508-status.sh t/t7606-merge-custom.sh \
t/t9302-fast-import-unpack-limit.sh
We excluded one set of test scripts in these commands, though: the range
of `git p4` tests. The reason? `git p4` stores the (foreign) remote
branch in the branch called `p4/master`, which is obviously not the
default branch. Manual analysis revealed that only five of these tests
actually require a specific default branch name to pass; They were
modified thusly:
$ sed -i '/^ *\. \.\/lib-git-p4\.sh$/i\
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\
' t/t980[0167]*.sh t/t9811*.sh
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-11-18 23:44:19 +00:00
|
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
|
2023-02-06 23:07:54 +00:00
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
2010-01-16 21:45:31 +00:00
|
|
|
. ./test-lib.sh
|
2010-10-16 18:37:02 +00:00
|
|
|
. "$TEST_DIRECTORY"/lib-terminal.sh
|
2010-01-16 21:45:31 +00:00
|
|
|
|
2010-10-16 18:37:01 +00:00
|
|
|
ensure_fresh_upstream() {
|
|
|
|
rm -rf parent && git init --bare parent
|
|
|
|
}
|
|
|
|
|
2010-01-16 21:45:31 +00:00
|
|
|
test_expect_success 'setup bare parent' '
|
2010-10-16 18:37:01 +00:00
|
|
|
ensure_fresh_upstream &&
|
2010-01-16 21:45:31 +00:00
|
|
|
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
|
|
|
|
}
|
|
|
|
|
2020-11-18 23:44:33 +00:00
|
|
|
test_expect_success 'push -u main:main' '
|
|
|
|
git push -u upstream main:main &&
|
|
|
|
check_config main upstream refs/heads/main
|
2010-01-16 21:45:31 +00:00
|
|
|
'
|
|
|
|
|
2020-11-18 23:44:33 +00:00
|
|
|
test_expect_success 'push -u main:other' '
|
|
|
|
git push -u upstream main:other &&
|
|
|
|
check_config main upstream refs/heads/other
|
2010-01-16 21:45:31 +00:00
|
|
|
'
|
|
|
|
|
2020-11-18 23:44:33 +00:00
|
|
|
test_expect_success 'push -u --dry-run main:otherX' '
|
|
|
|
git push -u --dry-run upstream main:otherX &&
|
|
|
|
check_config main upstream refs/heads/other
|
2010-01-16 21:45:31 +00:00
|
|
|
'
|
|
|
|
|
2020-09-26 21:04:21 +00:00
|
|
|
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
|
2010-01-16 21:45:31 +00:00
|
|
|
'
|
|
|
|
|
2020-09-26 21:04:21 +00:00
|
|
|
test_expect_success 'push -u topic_2:other2' '
|
|
|
|
git push -u upstream topic_2:other2 &&
|
|
|
|
check_config topic_2 upstream refs/heads/other2
|
2010-01-16 21:45:31 +00:00
|
|
|
'
|
|
|
|
|
2020-09-26 21:04:21 +00:00
|
|
|
test_expect_success 'push -u :topic_2' '
|
|
|
|
git push -u upstream :topic_2 &&
|
|
|
|
check_config topic_2 upstream refs/heads/other2
|
2010-01-16 21:45:31 +00:00
|
|
|
'
|
|
|
|
|
push: introduce '--branches' option
The '--all' option of git-push built-in cmd support to push all branches
(refs under refs/heads) to remote. Under the usage, a user can easlily
work in some scenarios, for example, branches synchronization and batch
upload.
The '--all' was introduced for a long time, meanwhile, git supports to
customize the storage location under "refs/". when a new git user see
the usage like, 'git push origin --all', we might feel like we're
pushing _all_ the refs instead of just branches without looking at the
documents until we found the related description of it or '--mirror'.
To ensure compatibility, we cannot rename '--all' to another name
directly, one way is, we can try to add a new option '--heads' which be
identical with the functionality of '--all' to let the user understand
the meaning of representation more clearly. Actually, We've more or less
named options this way already, for example, in 'git-show-ref' and 'git
ls-remote'.
At the same time, we fix a related issue about the wrong help
information of '--all' option in code and add some test cases in
t5523, t5543 and t5583.
Signed-off-by: Teng Long <dyroneteng@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-05-06 11:34:08 +00:00
|
|
|
test_expect_success 'push -u --all(the same behavior with--branches)' '
|
2010-01-16 21:45:31 +00:00
|
|
|
git branch all1 &&
|
|
|
|
git branch all2 &&
|
|
|
|
git push -u --all &&
|
|
|
|
check_config all1 upstream refs/heads/all1 &&
|
push: introduce '--branches' option
The '--all' option of git-push built-in cmd support to push all branches
(refs under refs/heads) to remote. Under the usage, a user can easlily
work in some scenarios, for example, branches synchronization and batch
upload.
The '--all' was introduced for a long time, meanwhile, git supports to
customize the storage location under "refs/". when a new git user see
the usage like, 'git push origin --all', we might feel like we're
pushing _all_ the refs instead of just branches without looking at the
documents until we found the related description of it or '--mirror'.
To ensure compatibility, we cannot rename '--all' to another name
directly, one way is, we can try to add a new option '--heads' which be
identical with the functionality of '--all' to let the user understand
the meaning of representation more clearly. Actually, We've more or less
named options this way already, for example, in 'git-show-ref' and 'git
ls-remote'.
At the same time, we fix a related issue about the wrong help
information of '--all' option in code and add some test cases in
t5523, t5543 and t5583.
Signed-off-by: Teng Long <dyroneteng@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-05-06 11:34:08 +00:00
|
|
|
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
|
2010-01-16 21:45:31 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'push -u HEAD' '
|
|
|
|
git checkout -b headbranch &&
|
|
|
|
git push -u upstream HEAD &&
|
|
|
|
check_config headbranch upstream refs/heads/headbranch
|
|
|
|
'
|
|
|
|
|
2010-10-16 18:37:02 +00:00
|
|
|
test_expect_success TTY 'progress messages go to tty' '
|
|
|
|
ensure_fresh_upstream &&
|
|
|
|
|
2020-11-18 23:44:33 +00:00
|
|
|
test_terminal git push -u upstream main >out 2>err &&
|
2023-10-31 05:23:30 +00:00
|
|
|
test_grep "Writing objects" err
|
2010-10-16 18:37:02 +00:00
|
|
|
'
|
|
|
|
|
2010-10-16 18:37:03 +00:00
|
|
|
test_expect_success 'progress messages do not go to non-tty' '
|
2010-10-16 18:37:02 +00:00
|
|
|
ensure_fresh_upstream &&
|
|
|
|
|
|
|
|
# skip progress messages, since stderr is non-tty
|
2020-11-18 23:44:33 +00:00
|
|
|
git push -u upstream main >out 2>err &&
|
2023-10-31 05:23:30 +00:00
|
|
|
test_grep ! "Writing objects" err
|
2010-10-16 18:37:02 +00:00
|
|
|
'
|
|
|
|
|
2010-10-16 18:37:03 +00:00
|
|
|
test_expect_success 'progress messages go to non-tty (forced)' '
|
2010-10-16 18:37:02 +00:00
|
|
|
ensure_fresh_upstream &&
|
|
|
|
|
|
|
|
# force progress messages to stderr, even though it is non-tty
|
2020-11-18 23:44:33 +00:00
|
|
|
git push -u --progress upstream main >out 2>err &&
|
2023-10-31 05:23:30 +00:00
|
|
|
test_grep "Writing objects" err
|
2010-10-16 18:37:02 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success TTY 'push -q suppresses progress' '
|
|
|
|
ensure_fresh_upstream &&
|
|
|
|
|
2020-11-18 23:44:33 +00:00
|
|
|
test_terminal git push -u -q upstream main >out 2>err &&
|
2023-10-31 05:23:30 +00:00
|
|
|
test_grep ! "Writing objects" err
|
2010-10-16 18:37:02 +00:00
|
|
|
'
|
|
|
|
|
2012-02-13 20:17:15 +00:00
|
|
|
test_expect_success TTY 'push --no-progress suppresses progress' '
|
2010-10-16 18:37:02 +00:00
|
|
|
ensure_fresh_upstream &&
|
|
|
|
|
2020-11-18 23:44:33 +00:00
|
|
|
test_terminal git push -u --no-progress upstream main >out 2>err &&
|
2023-10-31 05:23:30 +00:00
|
|
|
test_grep ! "Unpacking objects" err &&
|
|
|
|
test_grep ! "Writing objects" err
|
2010-10-16 18:37:02 +00:00
|
|
|
'
|
|
|
|
|
2012-01-08 21:06:20 +00:00
|
|
|
test_expect_success TTY 'quiet push' '
|
|
|
|
ensure_fresh_upstream &&
|
|
|
|
|
2020-11-18 23:44:33 +00:00
|
|
|
test_terminal git push --quiet --no-progress upstream main 2>&1 | tee output &&
|
2018-08-19 21:57:24 +00:00
|
|
|
test_must_be_empty output
|
2012-01-08 21:06:20 +00:00
|
|
|
'
|
|
|
|
|
2021-04-15 12:33:53 +00:00
|
|
|
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
|
|
|
|
'
|
|
|
|
|
2010-01-16 21:45:31 +00:00
|
|
|
test_done
|