2007-06-08 07:43:22 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
2013-04-02 07:40:30 +00:00
|
|
|
test_description='Basic fetch/push functionality.
|
|
|
|
|
|
|
|
This test checks the following functionality:
|
|
|
|
|
|
|
|
* command-line syntax
|
|
|
|
* refspecs
|
|
|
|
* fast-forward detection, and overriding it
|
|
|
|
* configuration
|
|
|
|
* hooks
|
|
|
|
* --porcelain output format
|
|
|
|
* hiderefs
|
fetch: load all default config at startup
When we start the git-fetch program, we call git_config to
load all config, but our callback only processes the
fetch.prune option; we do not chain to git_default_config at
all.
This means that we may not load some core configuration
which will have an effect. For instance, we do not load
core.logAllRefUpdates, which impacts whether or not we
create reflogs in a bare repository.
Note that I said "may" above. It gets even more exciting. If
we have to transfer actual objects as part of the fetch,
then we call fetch_pack as part of the same process. That
function loads its own config, which does chain to
git_default_config, impacting global variables which are
used by the rest of fetch. But if the fetch is a pure ref
update (e.g., a new ref which is a copy of an old one), we
skip fetch_pack entirely. So we get inconsistent results
depending on whether or not we have actual objects to
transfer or not!
Let's just load the core config at the start of fetch, so we
know we have it (we may also load it again as part of
fetch_pack, but that's OK; it's designed to be idempotent).
Our tests check both cases (with and without a pack). We
also check similar behavior for push for good measure, but
it already works as expected.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-11-04 13:11:19 +00:00
|
|
|
* reflogs
|
remote: create fetch.credentialsInUrl config
Users sometimes provide a "username:password" combination in their
plaintext URLs. Since Git stores these URLs in plaintext in the
.git/config file, this is a very insecure way of storing these
credentials. Credential managers are a more secure way of storing this
information.
System administrators might want to prevent this kind of use by users on
their machines.
Create a new "fetch.credentialsInUrl" config option and teach Git to
warn or die when seeing a URL with this kind of information. The warning
anonymizes the sensitive information of the URL to be clear about the
issue.
This change currently defaults the behavior to "allow" which does
nothing with these URLs. We can consider changing this behavior to
"warn" by default if we wish. At that time, we may want to add some
advice about setting fetch.credentialsInUrl=ignore for users who still
want to follow this pattern (and not receive the warning).
An earlier version of this change injected the logic into
url_normalize() in urlmatch.c. While most code paths that parse URLs
eventually normalize the URL, that normalization does not happen early
enough in the stack to avoid attempting connections to the URL first. By
inserting a check into the remote validation, we identify the issue
before making a connection. In the old code path, this was revealed by
testing the new t5601-clone.sh test under --stress, resulting in an
instance where the return code was 13 (SIGPIPE) instead of 128 from the
die().
However, we can reuse the parsing information from url_normalize() in
order to benefit from its well-worn parsing logic. We can use the struct
url_info that is created in that method to replace the password with
"<redacted>" in our error messages. This comes with a slight downside
that the normalized URL might look slightly different from the input URL
(for instance, the normalized version adds a closing slash). This should
not hinder users figuring out what the problem is and being able to fix
the issue.
As an attempt to ensure the parsing logic did not catch any
unintentional cases, I modified this change locally to to use the "die"
option by default. Running the test suite succeeds except for the
explicit username:password URLs used in t5550-http-fetch-dumb.sh and
t5541-http-push-smart.sh. This means that all other tested URLs did not
trigger this logic.
The tests show that the proper error messages appear (or do not
appear), but also count the number of error messages. When only warning,
each process validates the remote URL and outputs a warning. This
happens twice for clone, three times for fetch, and once for push.
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Derrick Stolee <derrickstolee@github.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-06-06 14:36:16 +00:00
|
|
|
* URL validation
|
2013-04-02 07:40:30 +00:00
|
|
|
'
|
2007-06-08 07:43:22 +00:00
|
|
|
|
2020-11-18 23:44:32 +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
|
|
|
|
|
tests: don't depend on template-created .git/branches
As noted in c8a58ac5a52 (Revert "Don't create the $GIT_DIR/branches
directory on init", 2009-10-31) there was an attempt long ago in
0cc5691a8b0 (Don't create the $GIT_DIR/branches directory on init,
2009-10-30) to get rid of the legacy "branches" directory.
We should probably get rid of its creation by removing the
"templates/branches--" file. But whatever our default behavior, our
tests should be tightened up to explicitly create the .git/branches
directory if they rely on our default templates, to make the
dependency on those templates clear.
So let's amend the two tests that would fail if .git/branches wasn't
created. To do this introduce a new "TEST_CREATE_REPO_NO_TEMPLATE"
variable, which we'll set before sourcing test-lib.sh, and change the
"git clone" and "git init" commands in the tests themselves to
explicitly pass "--template=".
This way they won't get a .git/branches in either their top-level
.git, or in the ones they create. We can then amend the tests that
rely on the ".git/branches" directory existing to create it
explicitly, and to remove it after its creation.
This new "TEST_CREATE_REPO_NO_TEMPLATE" variable is a less
heavy-handed version of the "NO_SET_GIT_TEMPLATE_DIR" variable. See
a94d305bf80 (t/t0001-init.sh: add test for 'init with init.templatedir
set', 2010-02-26) for its implementation.
Unlike "TEST_CREATE_REPO_NO_TEMPLATE", this new
"TEST_CREATE_REPO_NO_TEMPLATE" variable is narrowly scoped to what the
"git init" in test-lib.sh does, as opposed to the global effect of
"NO_SET_GIT_TEMPLATE_DIR" and the setting of "GIT_TEMPLATE_DIR" in
wrap-for-bin.sh.
I experimented with adding a new "GIT_WRAP_FOR_BIN_VIA_TEST_LIB"
variable set in test-lib.sh, which would cause wrap-for-bin.sh to not
set GIT_TEMPLATE_DIR, GITPERLLIB etc, as we set those in
test-lib.sh. I think that's a viable approach, but it would interact
e.g. with the appending feature of GITPERLLIB added in
8bade1e12e2 (wrap-for-bin: make bin-wrappers chainable, 2013-07-04).
Doing so would allow us to convert the tests in t0001-init.sh that now
use "NO_SET_GIT_TEMPLATE_DIR" to simply unset "GIT_TEMPLATE_DIR" in a
sub-shell before invoking "git init" or "git clone". I think that
approach is worth pursuing, but let's table it for now. Some future
wrap-for-bin.sh refactoring can try to address it.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-06-03 11:15:04 +00:00
|
|
|
TEST_CREATE_REPO_NO_TEMPLATE=1
|
2007-06-08 07:43:22 +00:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
2015-12-23 13:45:57 +00:00
|
|
|
D=$(pwd)
|
2007-06-08 07:43:22 +00:00
|
|
|
|
|
|
|
mk_empty () {
|
2013-04-02 07:40:31 +00:00
|
|
|
repo_name="$1"
|
fetch+push tests: use "test_hook" and "test_when_finished" pattern
Change the "t5516-fetch-push.sh" test code to make use of the new
"test_hook" helper, and to use "test_when_finished" to have tests
clean up their own state, instead of relying on subsequent tests to
clean the trash directory.
Before this each test would have been responsible for cleaning up
after a preceding test (which may or may not have run, e.g. if --run
or "GIT_SKIP_TESTS" was used), now each test will instead clean up
after itself.
In order to use both "test_hook" and "test_when_finished" we need to
move them out of sub-shells, which requires some refactoring.
While we're at it split up the "push with negotiation" test, now the
middle of the test doesn't need to "rm event", and since it delimited
two halves that were testing two different things the end-state is
easier to read and reason about.
While changing these lines make the minor change from "-fr" to "-rf"
as the "rm" argument, some of them used it already, it's more common
in the test suite, and it leaves the end-state of the file with more
consistency.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-03-17 10:13:11 +00:00
|
|
|
test_when_finished "rm -rf \"$repo_name\"" &&
|
|
|
|
test_path_is_missing "$repo_name" &&
|
tests: don't depend on template-created .git/branches
As noted in c8a58ac5a52 (Revert "Don't create the $GIT_DIR/branches
directory on init", 2009-10-31) there was an attempt long ago in
0cc5691a8b0 (Don't create the $GIT_DIR/branches directory on init,
2009-10-30) to get rid of the legacy "branches" directory.
We should probably get rid of its creation by removing the
"templates/branches--" file. But whatever our default behavior, our
tests should be tightened up to explicitly create the .git/branches
directory if they rely on our default templates, to make the
dependency on those templates clear.
So let's amend the two tests that would fail if .git/branches wasn't
created. To do this introduce a new "TEST_CREATE_REPO_NO_TEMPLATE"
variable, which we'll set before sourcing test-lib.sh, and change the
"git clone" and "git init" commands in the tests themselves to
explicitly pass "--template=".
This way they won't get a .git/branches in either their top-level
.git, or in the ones they create. We can then amend the tests that
rely on the ".git/branches" directory existing to create it
explicitly, and to remove it after its creation.
This new "TEST_CREATE_REPO_NO_TEMPLATE" variable is a less
heavy-handed version of the "NO_SET_GIT_TEMPLATE_DIR" variable. See
a94d305bf80 (t/t0001-init.sh: add test for 'init with init.templatedir
set', 2010-02-26) for its implementation.
Unlike "TEST_CREATE_REPO_NO_TEMPLATE", this new
"TEST_CREATE_REPO_NO_TEMPLATE" variable is narrowly scoped to what the
"git init" in test-lib.sh does, as opposed to the global effect of
"NO_SET_GIT_TEMPLATE_DIR" and the setting of "GIT_TEMPLATE_DIR" in
wrap-for-bin.sh.
I experimented with adding a new "GIT_WRAP_FOR_BIN_VIA_TEST_LIB"
variable set in test-lib.sh, which would cause wrap-for-bin.sh to not
set GIT_TEMPLATE_DIR, GITPERLLIB etc, as we set those in
test-lib.sh. I think that's a viable approach, but it would interact
e.g. with the appending feature of GITPERLLIB added in
8bade1e12e2 (wrap-for-bin: make bin-wrappers chainable, 2013-07-04).
Doing so would allow us to convert the tests in t0001-init.sh that now
use "NO_SET_GIT_TEMPLATE_DIR" to simply unset "GIT_TEMPLATE_DIR" in a
sub-shell before invoking "git init" or "git clone". I think that
approach is worth pursuing, but let's table it for now. Some future
wrap-for-bin.sh refactoring can try to address it.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-06-03 11:15:04 +00:00
|
|
|
git init --template= "$repo_name" &&
|
|
|
|
mkdir "$repo_name"/.git/hooks &&
|
fetch+push tests: use "test_hook" and "test_when_finished" pattern
Change the "t5516-fetch-push.sh" test code to make use of the new
"test_hook" helper, and to use "test_when_finished" to have tests
clean up their own state, instead of relying on subsequent tests to
clean the trash directory.
Before this each test would have been responsible for cleaning up
after a preceding test (which may or may not have run, e.g. if --run
or "GIT_SKIP_TESTS" was used), now each test will instead clean up
after itself.
In order to use both "test_hook" and "test_when_finished" we need to
move them out of sub-shells, which requires some refactoring.
While we're at it split up the "push with negotiation" test, now the
middle of the test doesn't need to "rm event", and since it delimited
two halves that were testing two different things the end-state is
easier to read and reason about.
While changing these lines make the minor change from "-fr" to "-rf"
as the "rm" argument, some of them used it already, it's more common
in the test suite, and it leaves the end-state of the file with more
consistency.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-03-17 10:13:11 +00:00
|
|
|
git -C "$repo_name" config receive.denyCurrentBranch warn
|
2007-06-08 07:43:22 +00:00
|
|
|
}
|
|
|
|
|
2007-06-09 08:23:53 +00:00
|
|
|
mk_test () {
|
2013-04-02 07:40:31 +00:00
|
|
|
repo_name="$1"
|
|
|
|
shift
|
|
|
|
|
|
|
|
mk_empty "$repo_name" &&
|
2007-06-09 08:23:53 +00:00
|
|
|
(
|
|
|
|
for ref in "$@"
|
|
|
|
do
|
2013-04-02 07:40:31 +00:00
|
|
|
git push "$repo_name" $the_first_commit:refs/$ref ||
|
2013-03-18 23:14:26 +00:00
|
|
|
exit
|
2007-06-09 08:23:53 +00:00
|
|
|
done &&
|
2013-04-02 07:40:31 +00:00
|
|
|
cd "$repo_name" &&
|
2007-06-09 08:23:53 +00:00
|
|
|
for ref in "$@"
|
|
|
|
do
|
2013-03-18 23:13:41 +00:00
|
|
|
echo "$the_first_commit" >expect &&
|
|
|
|
git show-ref -s --verify refs/$ref >actual &&
|
|
|
|
test_cmp expect actual ||
|
|
|
|
exit
|
2007-06-09 08:23:53 +00:00
|
|
|
done &&
|
|
|
|
git fsck --full
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
2011-09-28 15:39:35 +00:00
|
|
|
mk_test_with_hooks() {
|
2013-04-02 07:40:31 +00:00
|
|
|
repo_name=$1
|
2011-09-28 15:39:35 +00:00
|
|
|
mk_test "$@" &&
|
fetch+push tests: use "test_hook" and "test_when_finished" pattern
Change the "t5516-fetch-push.sh" test code to make use of the new
"test_hook" helper, and to use "test_when_finished" to have tests
clean up their own state, instead of relying on subsequent tests to
clean the trash directory.
Before this each test would have been responsible for cleaning up
after a preceding test (which may or may not have run, e.g. if --run
or "GIT_SKIP_TESTS" was used), now each test will instead clean up
after itself.
In order to use both "test_hook" and "test_when_finished" we need to
move them out of sub-shells, which requires some refactoring.
While we're at it split up the "push with negotiation" test, now the
middle of the test doesn't need to "rm event", and since it delimited
two halves that were testing two different things the end-state is
easier to read and reason about.
While changing these lines make the minor change from "-fr" to "-rf"
as the "rm" argument, some of them used it already, it's more common
in the test suite, and it leaves the end-state of the file with more
consistency.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-03-17 10:13:11 +00:00
|
|
|
test_hook -C "$repo_name" pre-receive <<-'EOF' &&
|
|
|
|
cat - >>pre-receive.actual
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_hook -C "$repo_name" update <<-'EOF' &&
|
|
|
|
printf "%s %s %s\n" "$@" >>update.actual
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_hook -C "$repo_name" post-receive <<-'EOF' &&
|
|
|
|
cat - >>post-receive.actual
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_hook -C "$repo_name" post-update <<-'EOF'
|
|
|
|
for ref in "$@"
|
|
|
|
do
|
|
|
|
printf "%s\n" "$ref" >>post-update.actual
|
|
|
|
done
|
|
|
|
EOF
|
2011-09-28 15:39:35 +00:00
|
|
|
}
|
|
|
|
|
2008-11-07 22:20:33 +00:00
|
|
|
mk_child() {
|
fetch+push tests: use "test_hook" and "test_when_finished" pattern
Change the "t5516-fetch-push.sh" test code to make use of the new
"test_hook" helper, and to use "test_when_finished" to have tests
clean up their own state, instead of relying on subsequent tests to
clean the trash directory.
Before this each test would have been responsible for cleaning up
after a preceding test (which may or may not have run, e.g. if --run
or "GIT_SKIP_TESTS" was used), now each test will instead clean up
after itself.
In order to use both "test_hook" and "test_when_finished" we need to
move them out of sub-shells, which requires some refactoring.
While we're at it split up the "push with negotiation" test, now the
middle of the test doesn't need to "rm event", and since it delimited
two halves that were testing two different things the end-state is
easier to read and reason about.
While changing these lines make the minor change from "-fr" to "-rf"
as the "rm" argument, some of them used it already, it's more common
in the test suite, and it leaves the end-state of the file with more
consistency.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-03-17 10:13:11 +00:00
|
|
|
test_when_finished "rm -rf \"$2\"" &&
|
tests: don't depend on template-created .git/branches
As noted in c8a58ac5a52 (Revert "Don't create the $GIT_DIR/branches
directory on init", 2009-10-31) there was an attempt long ago in
0cc5691a8b0 (Don't create the $GIT_DIR/branches directory on init,
2009-10-30) to get rid of the legacy "branches" directory.
We should probably get rid of its creation by removing the
"templates/branches--" file. But whatever our default behavior, our
tests should be tightened up to explicitly create the .git/branches
directory if they rely on our default templates, to make the
dependency on those templates clear.
So let's amend the two tests that would fail if .git/branches wasn't
created. To do this introduce a new "TEST_CREATE_REPO_NO_TEMPLATE"
variable, which we'll set before sourcing test-lib.sh, and change the
"git clone" and "git init" commands in the tests themselves to
explicitly pass "--template=".
This way they won't get a .git/branches in either their top-level
.git, or in the ones they create. We can then amend the tests that
rely on the ".git/branches" directory existing to create it
explicitly, and to remove it after its creation.
This new "TEST_CREATE_REPO_NO_TEMPLATE" variable is a less
heavy-handed version of the "NO_SET_GIT_TEMPLATE_DIR" variable. See
a94d305bf80 (t/t0001-init.sh: add test for 'init with init.templatedir
set', 2010-02-26) for its implementation.
Unlike "TEST_CREATE_REPO_NO_TEMPLATE", this new
"TEST_CREATE_REPO_NO_TEMPLATE" variable is narrowly scoped to what the
"git init" in test-lib.sh does, as opposed to the global effect of
"NO_SET_GIT_TEMPLATE_DIR" and the setting of "GIT_TEMPLATE_DIR" in
wrap-for-bin.sh.
I experimented with adding a new "GIT_WRAP_FOR_BIN_VIA_TEST_LIB"
variable set in test-lib.sh, which would cause wrap-for-bin.sh to not
set GIT_TEMPLATE_DIR, GITPERLLIB etc, as we set those in
test-lib.sh. I think that's a viable approach, but it would interact
e.g. with the appending feature of GITPERLLIB added in
8bade1e12e2 (wrap-for-bin: make bin-wrappers chainable, 2013-07-04).
Doing so would allow us to convert the tests in t0001-init.sh that now
use "NO_SET_GIT_TEMPLATE_DIR" to simply unset "GIT_TEMPLATE_DIR" in a
sub-shell before invoking "git init" or "git clone". I think that
approach is worth pursuing, but let's table it for now. Some future
wrap-for-bin.sh refactoring can try to address it.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-06-03 11:15:04 +00:00
|
|
|
git clone --template= "$1" "$2"
|
2008-11-07 22:20:33 +00:00
|
|
|
}
|
|
|
|
|
2007-06-09 08:23:53 +00:00
|
|
|
check_push_result () {
|
t5516-fetch-push: fix 'push with dry-run' test
In a while-at-it cleanup replacing a 'cd dir && <...> && cd ..' with a
subshell, commit 28391a80a9 (receive-pack: allow deletion of corrupt
refs, 2007-11-29) also moved the assignment of the $old_commit
variable to that subshell. This variable, however, is used outside of
that subshell as a parameter of check_push_result(), to check that a
ref still points to the commit where it is supposed to. With the
variable remaining unset outside the subshell check_push_result()
doesn't perform that check at all.
Use 'git -C <dir> cmd...', so we don't need to change directory, and
thus don't need the subshell either when setting $old_commit.
Furthermore, change check_push_result() to require at least three
parameters (the repo, the oid, and at least one ref), so it will catch
similar issues earlier should they ever arise.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-05-10 14:01:53 +00:00
|
|
|
test $# -ge 3 ||
|
tests: send "bug in the test script" errors to the script's stderr
Some of the functions in our test library check that they were invoked
properly with conditions like this:
test "$#" = 2 ||
error "bug in the test script: not 2 parameters to test-expect-success"
If this particular condition is triggered, then 'error' will abort the
whole test script with a bold red error message [1] right away.
However, under certain circumstances the test script will be aborted
completely silently, namely if:
- a similar condition in a test helper function like
'test_line_count' is triggered,
- which is invoked from the test script's "main" shell [2],
- and the test script is run manually (i.e. './t1234-foo.sh' as
opposed to 'make t1234-foo.sh' or 'make test') [3]
- and without the '--verbose' option,
because the error message is printed from within 'test_eval_', where
standard output is redirected either to /dev/null or to a log file.
The only indication that something is wrong is that not all tests in
the script are executed and at the end of the test script's output
there is no "# passed all N tests" message, which are subtle and can
easily go unnoticed, as I had to experience myself.
Send these "bug in the test script" error messages directly to the
test scripts standard error and thus to the terminal, so those bugs
will be much harder to overlook. Instead of updating all ~20 such
'error' calls with a redirection, let's add a BUG() function to
'test-lib.sh', wrapping an 'error' call with the proper redirection
and also including the common prefix of those error messages, and
convert all those call sites [4] to use this new BUG() function
instead.
[1] That particular error message from 'test_expect_success' is
printed in color only when running with or without '--verbose';
with '--tee' or '--verbose-log' the error is printed without
color, but it is printed to the terminal nonetheless.
[2] If such a condition is triggered in a subshell of a test, then
'error' won't be able to abort the whole test script, but only the
subshell, which in turn causes the test to fail in the usual way,
indicating loudly and clearly that something is wrong.
[3] Well, 'error' aborts the test script the same way when run
manually or by 'make' or 'prove', but both 'make' and 'prove' pay
attention to the test script's exit status, and even a silently
aborted test script would then trigger those tools' usual
noticable error messages.
[4] Strictly speaking, not all those 'error' calls need that
redirection to send their output to the terminal, see e.g.
'test_expect_success' in the opening example, but I think it's
better to be consistent.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-11-19 13:13:26 +00:00
|
|
|
BUG "check_push_result requires at least 3 parameters"
|
t5516-fetch-push: fix 'push with dry-run' test
In a while-at-it cleanup replacing a 'cd dir && <...> && cd ..' with a
subshell, commit 28391a80a9 (receive-pack: allow deletion of corrupt
refs, 2007-11-29) also moved the assignment of the $old_commit
variable to that subshell. This variable, however, is used outside of
that subshell as a parameter of check_push_result(), to check that a
ref still points to the commit where it is supposed to. With the
variable remaining unset outside the subshell check_push_result()
doesn't perform that check at all.
Use 'git -C <dir> cmd...', so we don't need to change directory, and
thus don't need the subshell either when setting $old_commit.
Furthermore, change check_push_result() to require at least three
parameters (the repo, the oid, and at least one ref), so it will catch
similar issues earlier should they ever arise.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-05-10 14:01:53 +00:00
|
|
|
|
2013-04-02 07:40:31 +00:00
|
|
|
repo_name="$1"
|
|
|
|
shift
|
|
|
|
|
2007-06-09 08:23:53 +00:00
|
|
|
(
|
2013-04-02 07:40:31 +00:00
|
|
|
cd "$repo_name" &&
|
2013-03-18 23:13:41 +00:00
|
|
|
echo "$1" >expect &&
|
|
|
|
shift &&
|
2007-06-09 08:23:53 +00:00
|
|
|
for ref in "$@"
|
|
|
|
do
|
2013-03-18 23:13:41 +00:00
|
|
|
git show-ref -s --verify refs/$ref >actual &&
|
|
|
|
test_cmp expect actual ||
|
|
|
|
exit
|
2007-06-09 08:23:53 +00:00
|
|
|
done &&
|
|
|
|
git fsck --full
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
2007-06-08 07:43:22 +00:00
|
|
|
test_expect_success setup '
|
|
|
|
|
2010-04-19 22:08:31 +00:00
|
|
|
>path1 &&
|
2007-06-08 07:43:22 +00:00
|
|
|
git add path1 &&
|
|
|
|
test_tick &&
|
|
|
|
git commit -a -m repo &&
|
2020-11-18 23:44:32 +00:00
|
|
|
the_first_commit=$(git show-ref -s --verify refs/heads/main) &&
|
2007-06-09 08:23:53 +00:00
|
|
|
|
2010-04-19 22:08:31 +00:00
|
|
|
>path2 &&
|
2007-06-09 08:23:53 +00:00
|
|
|
git add path2 &&
|
|
|
|
test_tick &&
|
|
|
|
git commit -a -m second &&
|
2020-11-18 23:44:32 +00:00
|
|
|
the_commit=$(git show-ref -s --verify refs/heads/main)
|
2007-06-08 07:43:22 +00:00
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'fetch without wildcard' '
|
2013-04-02 07:40:31 +00:00
|
|
|
mk_empty testrepo &&
|
2007-06-08 07:43:22 +00:00
|
|
|
(
|
|
|
|
cd testrepo &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git fetch .. refs/heads/main:refs/remotes/origin/main &&
|
2007-06-08 07:43:22 +00:00
|
|
|
|
2020-11-18 23:44:32 +00:00
|
|
|
echo "$the_commit commit refs/remotes/origin/main" >expect &&
|
2013-03-18 23:13:41 +00:00
|
|
|
git for-each-ref refs/remotes/origin >actual &&
|
|
|
|
test_cmp expect actual
|
2007-06-08 07:43:22 +00:00
|
|
|
)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'fetch with wildcard' '
|
2013-04-02 07:40:31 +00:00
|
|
|
mk_empty testrepo &&
|
2007-06-08 07:43:22 +00:00
|
|
|
(
|
|
|
|
cd testrepo &&
|
|
|
|
git config remote.up.url .. &&
|
|
|
|
git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
|
|
|
|
git fetch up &&
|
|
|
|
|
2020-11-18 23:44:32 +00:00
|
|
|
echo "$the_commit commit refs/remotes/origin/main" >expect &&
|
2013-03-18 23:13:41 +00:00
|
|
|
git for-each-ref refs/remotes/origin >actual &&
|
|
|
|
test_cmp expect actual
|
2007-06-08 07:43:22 +00:00
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2008-02-20 18:43:53 +00:00
|
|
|
test_expect_success 'fetch with insteadOf' '
|
2013-04-02 07:40:31 +00:00
|
|
|
mk_empty testrepo &&
|
2008-02-20 18:43:53 +00:00
|
|
|
(
|
2008-04-12 19:32:00 +00:00
|
|
|
TRASH=$(pwd)/ &&
|
2008-02-20 18:43:53 +00:00
|
|
|
cd testrepo &&
|
2008-05-04 05:37:59 +00:00
|
|
|
git config "url.$TRASH.insteadOf" trash/ &&
|
2008-02-20 18:43:53 +00:00
|
|
|
git config remote.up.url trash/. &&
|
|
|
|
git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
|
|
|
|
git fetch up &&
|
|
|
|
|
2020-11-18 23:44:32 +00:00
|
|
|
echo "$the_commit commit refs/remotes/origin/main" >expect &&
|
2013-03-18 23:13:41 +00:00
|
|
|
git for-each-ref refs/remotes/origin >actual &&
|
|
|
|
test_cmp expect actual
|
2008-02-20 18:43:53 +00:00
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2009-09-07 08:56:33 +00:00
|
|
|
test_expect_success 'fetch with pushInsteadOf (should not rewrite)' '
|
2013-04-02 07:40:31 +00:00
|
|
|
mk_empty testrepo &&
|
2009-09-07 08:56:33 +00:00
|
|
|
(
|
|
|
|
TRASH=$(pwd)/ &&
|
|
|
|
cd testrepo &&
|
|
|
|
git config "url.trash/.pushInsteadOf" "$TRASH" &&
|
|
|
|
git config remote.up.url "$TRASH." &&
|
|
|
|
git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
|
|
|
|
git fetch up &&
|
|
|
|
|
2020-11-18 23:44:32 +00:00
|
|
|
echo "$the_commit commit refs/remotes/origin/main" >expect &&
|
2013-03-18 23:13:41 +00:00
|
|
|
git for-each-ref refs/remotes/origin >actual &&
|
|
|
|
test_cmp expect actual
|
2009-09-07 08:56:33 +00:00
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2021-05-04 21:16:02 +00:00
|
|
|
grep_wrote () {
|
|
|
|
object_count=$1
|
|
|
|
file_name=$2
|
|
|
|
grep 'write_pack_file/wrote.*"value":"'$1'"' $2
|
|
|
|
}
|
|
|
|
|
fetch+push tests: use "test_hook" and "test_when_finished" pattern
Change the "t5516-fetch-push.sh" test code to make use of the new
"test_hook" helper, and to use "test_when_finished" to have tests
clean up their own state, instead of relying on subsequent tests to
clean the trash directory.
Before this each test would have been responsible for cleaning up
after a preceding test (which may or may not have run, e.g. if --run
or "GIT_SKIP_TESTS" was used), now each test will instead clean up
after itself.
In order to use both "test_hook" and "test_when_finished" we need to
move them out of sub-shells, which requires some refactoring.
While we're at it split up the "push with negotiation" test, now the
middle of the test doesn't need to "rm event", and since it delimited
two halves that were testing two different things the end-state is
easier to read and reason about.
While changing these lines make the minor change from "-fr" to "-rf"
as the "rm" argument, some of them used it already, it's more common
in the test suite, and it leaves the end-state of the file with more
consistency.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-03-17 10:13:11 +00:00
|
|
|
test_expect_success 'push without negotiation' '
|
2021-05-04 21:16:02 +00:00
|
|
|
mk_empty testrepo &&
|
|
|
|
git push testrepo $the_first_commit:refs/remotes/origin/first_commit &&
|
2021-07-15 17:44:31 +00:00
|
|
|
test_commit -C testrepo unrelated_commit &&
|
2021-05-04 21:16:02 +00:00
|
|
|
git -C testrepo config receive.hideRefs refs/remotes/origin/first_commit &&
|
fetch+push tests: use "test_hook" and "test_when_finished" pattern
Change the "t5516-fetch-push.sh" test code to make use of the new
"test_hook" helper, and to use "test_when_finished" to have tests
clean up their own state, instead of relying on subsequent tests to
clean the trash directory.
Before this each test would have been responsible for cleaning up
after a preceding test (which may or may not have run, e.g. if --run
or "GIT_SKIP_TESTS" was used), now each test will instead clean up
after itself.
In order to use both "test_hook" and "test_when_finished" we need to
move them out of sub-shells, which requires some refactoring.
While we're at it split up the "push with negotiation" test, now the
middle of the test doesn't need to "rm event", and since it delimited
two halves that were testing two different things the end-state is
easier to read and reason about.
While changing these lines make the minor change from "-fr" to "-rf"
as the "rm" argument, some of them used it already, it's more common
in the test suite, and it leaves the end-state of the file with more
consistency.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-03-17 10:13:11 +00:00
|
|
|
test_when_finished "rm event" &&
|
2021-05-04 21:16:02 +00:00
|
|
|
GIT_TRACE2_EVENT="$(pwd)/event" git -c protocol.version=2 push testrepo refs/heads/main:refs/remotes/origin/main &&
|
fetch+push tests: use "test_hook" and "test_when_finished" pattern
Change the "t5516-fetch-push.sh" test code to make use of the new
"test_hook" helper, and to use "test_when_finished" to have tests
clean up their own state, instead of relying on subsequent tests to
clean the trash directory.
Before this each test would have been responsible for cleaning up
after a preceding test (which may or may not have run, e.g. if --run
or "GIT_SKIP_TESTS" was used), now each test will instead clean up
after itself.
In order to use both "test_hook" and "test_when_finished" we need to
move them out of sub-shells, which requires some refactoring.
While we're at it split up the "push with negotiation" test, now the
middle of the test doesn't need to "rm event", and since it delimited
two halves that were testing two different things the end-state is
easier to read and reason about.
While changing these lines make the minor change from "-fr" to "-rf"
as the "rm" argument, some of them used it already, it's more common
in the test suite, and it leaves the end-state of the file with more
consistency.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-03-17 10:13:11 +00:00
|
|
|
grep_wrote 5 event # 2 commits, 2 trees, 1 blob
|
|
|
|
'
|
2021-05-04 21:16:02 +00:00
|
|
|
|
fetch+push tests: use "test_hook" and "test_when_finished" pattern
Change the "t5516-fetch-push.sh" test code to make use of the new
"test_hook" helper, and to use "test_when_finished" to have tests
clean up their own state, instead of relying on subsequent tests to
clean the trash directory.
Before this each test would have been responsible for cleaning up
after a preceding test (which may or may not have run, e.g. if --run
or "GIT_SKIP_TESTS" was used), now each test will instead clean up
after itself.
In order to use both "test_hook" and "test_when_finished" we need to
move them out of sub-shells, which requires some refactoring.
While we're at it split up the "push with negotiation" test, now the
middle of the test doesn't need to "rm event", and since it delimited
two halves that were testing two different things the end-state is
easier to read and reason about.
While changing these lines make the minor change from "-fr" to "-rf"
as the "rm" argument, some of them used it already, it's more common
in the test suite, and it leaves the end-state of the file with more
consistency.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-03-17 10:13:11 +00:00
|
|
|
test_expect_success 'push with negotiation' '
|
2021-05-04 21:16:02 +00:00
|
|
|
mk_empty testrepo &&
|
|
|
|
git push testrepo $the_first_commit:refs/remotes/origin/first_commit &&
|
2021-07-15 17:44:31 +00:00
|
|
|
test_commit -C testrepo unrelated_commit &&
|
2021-05-04 21:16:02 +00:00
|
|
|
git -C testrepo config receive.hideRefs refs/remotes/origin/first_commit &&
|
fetch+push tests: use "test_hook" and "test_when_finished" pattern
Change the "t5516-fetch-push.sh" test code to make use of the new
"test_hook" helper, and to use "test_when_finished" to have tests
clean up their own state, instead of relying on subsequent tests to
clean the trash directory.
Before this each test would have been responsible for cleaning up
after a preceding test (which may or may not have run, e.g. if --run
or "GIT_SKIP_TESTS" was used), now each test will instead clean up
after itself.
In order to use both "test_hook" and "test_when_finished" we need to
move them out of sub-shells, which requires some refactoring.
While we're at it split up the "push with negotiation" test, now the
middle of the test doesn't need to "rm event", and since it delimited
two halves that were testing two different things the end-state is
easier to read and reason about.
While changing these lines make the minor change from "-fr" to "-rf"
as the "rm" argument, some of them used it already, it's more common
in the test suite, and it leaves the end-state of the file with more
consistency.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-03-17 10:13:11 +00:00
|
|
|
test_when_finished "rm event" &&
|
fetch-pack: add tracing for negotiation rounds
Currently, negotiation for V0/V1/V2 fetch have trace2 regions covering
the entire negotiation process. However, we'd like additional data, such
as timing for each round of negotiation or the number of "haves" in each
round. Additionally, "independent negotiation" (AKA push negotiation)
has no tracing at all. Having this data would allow us to compare the
performance of the various negotation implementations, and to debug
unexpectedly slow fetch & push sessions.
Add per-round trace2 regions for all negotiation implementations (V0+V1,
V2, and independent negotiation), as well as an overall region for
independent negotiation. Add trace2 data logging for the number of haves
and "in vain" objects for each round, and for the total number of rounds
once negotiation completes. Finally, add a few checks into various
tests to verify that the number of rounds is logged as expected.
Signed-off-by: Josh Steadmon <steadmon@google.com>
Acked-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-08-02 22:04:05 +00:00
|
|
|
GIT_TRACE2_EVENT="$(pwd)/event" \
|
|
|
|
git -c protocol.version=2 -c push.negotiate=1 \
|
|
|
|
push testrepo refs/heads/main:refs/remotes/origin/main &&
|
|
|
|
grep \"key\":\"total_rounds\",\"value\":\"1\" event &&
|
2021-05-04 21:16:02 +00:00
|
|
|
grep_wrote 2 event # 1 commit, 1 tree
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'push with negotiation proceeds anyway even if negotiation fails' '
|
|
|
|
mk_empty testrepo &&
|
|
|
|
git push testrepo $the_first_commit:refs/remotes/origin/first_commit &&
|
2021-07-15 17:44:31 +00:00
|
|
|
test_commit -C testrepo unrelated_commit &&
|
2021-05-04 21:16:02 +00:00
|
|
|
git -C testrepo config receive.hideRefs refs/remotes/origin/first_commit &&
|
fetch+push tests: use "test_hook" and "test_when_finished" pattern
Change the "t5516-fetch-push.sh" test code to make use of the new
"test_hook" helper, and to use "test_when_finished" to have tests
clean up their own state, instead of relying on subsequent tests to
clean the trash directory.
Before this each test would have been responsible for cleaning up
after a preceding test (which may or may not have run, e.g. if --run
or "GIT_SKIP_TESTS" was used), now each test will instead clean up
after itself.
In order to use both "test_hook" and "test_when_finished" we need to
move them out of sub-shells, which requires some refactoring.
While we're at it split up the "push with negotiation" test, now the
middle of the test doesn't need to "rm event", and since it delimited
two halves that were testing two different things the end-state is
easier to read and reason about.
While changing these lines make the minor change from "-fr" to "-rf"
as the "rm" argument, some of them used it already, it's more common
in the test suite, and it leaves the end-state of the file with more
consistency.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-03-17 10:13:11 +00:00
|
|
|
test_when_finished "rm event" &&
|
2021-05-04 21:16:02 +00:00
|
|
|
GIT_TEST_PROTOCOL_VERSION=0 GIT_TRACE2_EVENT="$(pwd)/event" \
|
|
|
|
git -c push.negotiate=1 push testrepo refs/heads/main:refs/remotes/origin/main 2>err &&
|
|
|
|
grep_wrote 5 event && # 2 commits, 2 trees, 1 blob
|
|
|
|
test_i18ngrep "push negotiation failed" err
|
|
|
|
'
|
|
|
|
|
2022-01-19 00:00:56 +00:00
|
|
|
test_expect_success 'push with negotiation does not attempt to fetch submodules' '
|
|
|
|
mk_empty submodule_upstream &&
|
|
|
|
test_commit -C submodule_upstream submodule_commit &&
|
2022-09-30 20:47:00 +00:00
|
|
|
test_config_global protocol.file.allow always &&
|
2022-01-19 00:00:56 +00:00
|
|
|
git submodule add ./submodule_upstream submodule &&
|
|
|
|
mk_empty testrepo &&
|
|
|
|
git push testrepo $the_first_commit:refs/remotes/origin/first_commit &&
|
|
|
|
test_commit -C testrepo unrelated_commit &&
|
|
|
|
git -C testrepo config receive.hideRefs refs/remotes/origin/first_commit &&
|
fetch-pack: add tracing for negotiation rounds
Currently, negotiation for V0/V1/V2 fetch have trace2 regions covering
the entire negotiation process. However, we'd like additional data, such
as timing for each round of negotiation or the number of "haves" in each
round. Additionally, "independent negotiation" (AKA push negotiation)
has no tracing at all. Having this data would allow us to compare the
performance of the various negotation implementations, and to debug
unexpectedly slow fetch & push sessions.
Add per-round trace2 regions for all negotiation implementations (V0+V1,
V2, and independent negotiation), as well as an overall region for
independent negotiation. Add trace2 data logging for the number of haves
and "in vain" objects for each round, and for the total number of rounds
once negotiation completes. Finally, add a few checks into various
tests to verify that the number of rounds is logged as expected.
Signed-off-by: Josh Steadmon <steadmon@google.com>
Acked-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-08-02 22:04:05 +00:00
|
|
|
GIT_TRACE2_EVENT="$(pwd)/event" git -c submodule.recurse=true \
|
|
|
|
-c protocol.version=2 -c push.negotiate=1 \
|
|
|
|
push testrepo refs/heads/main:refs/remotes/origin/main 2>err &&
|
|
|
|
grep \"key\":\"total_rounds\",\"value\":\"1\" event &&
|
2022-01-19 00:00:56 +00:00
|
|
|
! grep "Fetching submodule" err
|
|
|
|
'
|
|
|
|
|
2007-06-08 07:43:22 +00:00
|
|
|
test_expect_success 'push without wildcard' '
|
2013-04-02 07:40:31 +00:00
|
|
|
mk_empty testrepo &&
|
2007-06-08 07:43:22 +00:00
|
|
|
|
2020-11-18 23:44:32 +00:00
|
|
|
git push testrepo refs/heads/main:refs/remotes/origin/main &&
|
2007-06-08 07:43:22 +00:00
|
|
|
(
|
|
|
|
cd testrepo &&
|
2020-11-18 23:44:32 +00:00
|
|
|
echo "$the_commit commit refs/remotes/origin/main" >expect &&
|
2013-03-18 23:13:41 +00:00
|
|
|
git for-each-ref refs/remotes/origin >actual &&
|
|
|
|
test_cmp expect actual
|
2007-06-08 07:43:22 +00:00
|
|
|
)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'push with wildcard' '
|
2013-04-02 07:40:31 +00:00
|
|
|
mk_empty testrepo &&
|
2007-06-08 07:43:22 +00:00
|
|
|
|
|
|
|
git push testrepo "refs/heads/*:refs/remotes/origin/*" &&
|
|
|
|
(
|
|
|
|
cd testrepo &&
|
2020-11-18 23:44:32 +00:00
|
|
|
echo "$the_commit commit refs/remotes/origin/main" >expect &&
|
2013-03-18 23:13:41 +00:00
|
|
|
git for-each-ref refs/remotes/origin >actual &&
|
|
|
|
test_cmp expect actual
|
2007-06-08 07:43:22 +00:00
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2008-02-20 18:43:53 +00:00
|
|
|
test_expect_success 'push with insteadOf' '
|
2013-04-02 07:40:31 +00:00
|
|
|
mk_empty testrepo &&
|
2008-05-04 05:37:59 +00:00
|
|
|
TRASH="$(pwd)/" &&
|
2013-03-18 23:12:11 +00:00
|
|
|
test_config "url.$TRASH.insteadOf" trash/ &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git push trash/testrepo refs/heads/main:refs/remotes/origin/main &&
|
2008-02-20 18:43:53 +00:00
|
|
|
(
|
|
|
|
cd testrepo &&
|
2020-11-18 23:44:32 +00:00
|
|
|
echo "$the_commit commit refs/remotes/origin/main" >expect &&
|
2013-03-18 23:13:41 +00:00
|
|
|
git for-each-ref refs/remotes/origin >actual &&
|
|
|
|
test_cmp expect actual
|
2008-02-20 18:43:53 +00:00
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2009-09-07 08:56:33 +00:00
|
|
|
test_expect_success 'push with pushInsteadOf' '
|
2013-04-02 07:40:31 +00:00
|
|
|
mk_empty testrepo &&
|
2009-09-07 08:56:33 +00:00
|
|
|
TRASH="$(pwd)/" &&
|
2013-03-18 23:12:11 +00:00
|
|
|
test_config "url.$TRASH.pushInsteadOf" trash/ &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git push trash/testrepo refs/heads/main:refs/remotes/origin/main &&
|
2009-09-07 08:56:33 +00:00
|
|
|
(
|
|
|
|
cd testrepo &&
|
2020-11-18 23:44:32 +00:00
|
|
|
echo "$the_commit commit refs/remotes/origin/main" >expect &&
|
2013-03-18 23:13:41 +00:00
|
|
|
git for-each-ref refs/remotes/origin >actual &&
|
|
|
|
test_cmp expect actual
|
2009-09-07 08:56:33 +00:00
|
|
|
)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'push with pushInsteadOf and explicit pushurl (pushInsteadOf should not rewrite)' '
|
2013-04-02 07:40:31 +00:00
|
|
|
mk_empty testrepo &&
|
2013-04-03 16:34:48 +00:00
|
|
|
test_config "url.trash2/.pushInsteadOf" testrepo/ &&
|
2015-03-01 04:18:14 +00:00
|
|
|
test_config "url.trash3/.pushInsteadOf" trash/wrong &&
|
2013-03-18 23:12:11 +00:00
|
|
|
test_config remote.r.url trash/wrong &&
|
2013-04-03 16:34:48 +00:00
|
|
|
test_config remote.r.pushurl "testrepo/" &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git push r refs/heads/main:refs/remotes/origin/main &&
|
2009-09-07 08:56:33 +00:00
|
|
|
(
|
|
|
|
cd testrepo &&
|
2020-11-18 23:44:32 +00:00
|
|
|
echo "$the_commit commit refs/remotes/origin/main" >expect &&
|
2013-03-18 23:13:41 +00:00
|
|
|
git for-each-ref refs/remotes/origin >actual &&
|
|
|
|
test_cmp expect actual
|
2009-09-07 08:56:33 +00:00
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2007-06-09 08:23:53 +00:00
|
|
|
test_expect_success 'push with matching heads' '
|
|
|
|
|
2020-11-18 23:44:32 +00:00
|
|
|
mk_test testrepo heads/main &&
|
2013-01-05 00:08:26 +00:00
|
|
|
git push testrepo : &&
|
2020-11-18 23:44:32 +00:00
|
|
|
check_push_result testrepo $the_commit heads/main
|
2007-06-09 08:23:53 +00:00
|
|
|
|
|
|
|
'
|
|
|
|
|
2008-04-28 15:32:12 +00:00
|
|
|
test_expect_success 'push with matching heads on the command line' '
|
|
|
|
|
2020-11-18 23:44:32 +00:00
|
|
|
mk_test testrepo heads/main &&
|
2008-04-28 15:32:12 +00:00
|
|
|
git push testrepo : &&
|
2020-11-18 23:44:32 +00:00
|
|
|
check_push_result testrepo $the_commit heads/main
|
2008-04-28 15:32:12 +00:00
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'failed (non-fast-forward) push with matching heads' '
|
|
|
|
|
2020-11-18 23:44:32 +00:00
|
|
|
mk_test testrepo heads/main &&
|
2008-04-28 15:32:12 +00:00
|
|
|
git push testrepo : &&
|
|
|
|
git commit --amend -massaged &&
|
2008-07-12 15:47:52 +00:00
|
|
|
test_must_fail git push testrepo &&
|
2020-11-18 23:44:32 +00:00
|
|
|
check_push_result testrepo $the_commit heads/main &&
|
2008-04-28 15:32:12 +00:00
|
|
|
git reset --hard $the_commit
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'push --force with matching heads' '
|
|
|
|
|
2020-11-18 23:44:32 +00:00
|
|
|
mk_test testrepo heads/main &&
|
2008-04-28 15:32:12 +00:00
|
|
|
git push testrepo : &&
|
|
|
|
git commit --amend -massaged &&
|
2013-01-05 00:08:26 +00:00
|
|
|
git push --force testrepo : &&
|
2020-11-18 23:44:32 +00:00
|
|
|
! check_push_result testrepo $the_commit heads/main &&
|
2008-04-28 15:32:12 +00:00
|
|
|
git reset --hard $the_commit
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'push with matching heads and forced update' '
|
|
|
|
|
2020-11-18 23:44:32 +00:00
|
|
|
mk_test testrepo heads/main &&
|
2008-04-28 15:32:12 +00:00
|
|
|
git push testrepo : &&
|
|
|
|
git commit --amend -massaged &&
|
|
|
|
git push testrepo +: &&
|
2020-11-18 23:44:32 +00:00
|
|
|
! check_push_result testrepo $the_commit heads/main &&
|
2008-04-28 15:32:12 +00:00
|
|
|
git reset --hard $the_commit
|
|
|
|
|
|
|
|
'
|
|
|
|
|
2007-06-09 08:23:53 +00:00
|
|
|
test_expect_success 'push with no ambiguity (1)' '
|
|
|
|
|
2020-11-18 23:44:32 +00:00
|
|
|
mk_test testrepo heads/main &&
|
|
|
|
git push testrepo main:main &&
|
|
|
|
check_push_result testrepo $the_commit heads/main
|
2007-06-09 08:23:53 +00:00
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'push with no ambiguity (2)' '
|
|
|
|
|
2020-11-18 23:44:32 +00:00
|
|
|
mk_test testrepo remotes/origin/main &&
|
|
|
|
git push testrepo main:origin/main &&
|
|
|
|
check_push_result testrepo $the_commit remotes/origin/main
|
2007-06-09 08:23:53 +00:00
|
|
|
|
|
|
|
'
|
|
|
|
|
2007-11-11 14:01:47 +00:00
|
|
|
test_expect_success 'push with colon-less refspec, no ambiguity' '
|
|
|
|
|
2020-11-18 23:44:32 +00:00
|
|
|
mk_test testrepo heads/main heads/t/main &&
|
|
|
|
git branch -f t/main main &&
|
|
|
|
git push testrepo main &&
|
|
|
|
check_push_result testrepo $the_commit heads/main &&
|
|
|
|
check_push_result testrepo $the_first_commit heads/t/main
|
2007-11-11 14:01:47 +00:00
|
|
|
|
|
|
|
'
|
|
|
|
|
2007-06-09 08:23:53 +00:00
|
|
|
test_expect_success 'push with weak ambiguity (1)' '
|
|
|
|
|
2020-11-18 23:44:32 +00:00
|
|
|
mk_test testrepo heads/main remotes/origin/main &&
|
|
|
|
git push testrepo main:main &&
|
|
|
|
check_push_result testrepo $the_commit heads/main &&
|
|
|
|
check_push_result testrepo $the_first_commit remotes/origin/main
|
2007-06-09 08:23:53 +00:00
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'push with weak ambiguity (2)' '
|
|
|
|
|
2020-11-18 23:44:32 +00:00
|
|
|
mk_test testrepo heads/main remotes/origin/main remotes/another/main &&
|
|
|
|
git push testrepo main:main &&
|
|
|
|
check_push_result testrepo $the_commit heads/main &&
|
|
|
|
check_push_result testrepo $the_first_commit remotes/origin/main remotes/another/main
|
2007-06-09 08:23:53 +00:00
|
|
|
|
|
|
|
'
|
|
|
|
|
2008-04-23 09:21:45 +00:00
|
|
|
test_expect_success 'push with ambiguity' '
|
2007-06-09 08:23:53 +00:00
|
|
|
|
2013-04-02 07:40:31 +00:00
|
|
|
mk_test testrepo heads/frotz tags/frotz &&
|
2020-11-18 23:44:32 +00:00
|
|
|
test_must_fail git push testrepo main:frotz &&
|
2013-04-02 07:40:31 +00:00
|
|
|
check_push_result testrepo $the_first_commit heads/frotz tags/frotz
|
2007-06-09 08:37:14 +00:00
|
|
|
|
|
|
|
'
|
|
|
|
|
push: allow delete single-level ref
We discourage the creation/update of single-level refs
because some upper-layer applications only work in specified
reference namespaces, such as "refs/heads/*" or "refs/tags/*",
these single-level refnames may not be recognized. However,
we still hope users can delete them which have been created
by mistake.
Therefore, when updating branches on the server with
"git receive-pack", by checking whether it is a branch deletion
operation, it will determine whether to allow the update of
a single-level refs. This avoids creating/updating such
single-level refs, but allows them to be deleted.
On the client side, "git push" also does not properly fill in
the old-oid of single-level refs, which causes the server-side
"git receive-pack" to think that the ref's old-oid has changed
when deleting single-level refs, this causes the push to be
rejected. So the solution is to fix the client to be able to
delete single-level refs by properly filling old-oid.
Signed-off-by: ZheNing Hu <adlternative@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-03-01 10:20:29 +00:00
|
|
|
test_expect_success 'push with onelevel ref' '
|
|
|
|
mk_test testrepo heads/main &&
|
|
|
|
test_must_fail git push testrepo HEAD:refs/onelevel
|
|
|
|
'
|
|
|
|
|
2007-06-09 08:37:14 +00:00
|
|
|
test_expect_success 'push with colon-less refspec (1)' '
|
|
|
|
|
2013-04-02 07:40:31 +00:00
|
|
|
mk_test testrepo heads/frotz tags/frotz &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git branch -f frotz main &&
|
2007-06-09 08:37:14 +00:00
|
|
|
git push testrepo frotz &&
|
2013-04-02 07:40:31 +00:00
|
|
|
check_push_result testrepo $the_commit heads/frotz &&
|
|
|
|
check_push_result testrepo $the_first_commit tags/frotz
|
2007-06-09 08:37:14 +00:00
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'push with colon-less refspec (2)' '
|
|
|
|
|
2013-04-02 07:40:31 +00:00
|
|
|
mk_test testrepo heads/frotz tags/frotz &&
|
2007-06-09 08:37:14 +00:00
|
|
|
if git show-ref --verify -q refs/heads/frotz
|
|
|
|
then
|
|
|
|
git branch -D frotz
|
|
|
|
fi &&
|
|
|
|
git tag -f frotz &&
|
2012-11-30 01:41:37 +00:00
|
|
|
git push -f testrepo frotz &&
|
2013-04-02 07:40:31 +00:00
|
|
|
check_push_result testrepo $the_commit tags/frotz &&
|
|
|
|
check_push_result testrepo $the_first_commit heads/frotz
|
2007-06-09 08:37:14 +00:00
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'push with colon-less refspec (3)' '
|
|
|
|
|
2013-04-02 07:40:31 +00:00
|
|
|
mk_test testrepo &&
|
2007-06-09 08:37:14 +00:00
|
|
|
if git show-ref --verify -q refs/tags/frotz
|
|
|
|
then
|
|
|
|
git tag -d frotz
|
|
|
|
fi &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git branch -f frotz main &&
|
2007-06-09 08:37:14 +00:00
|
|
|
git push testrepo frotz &&
|
2013-04-02 07:40:31 +00:00
|
|
|
check_push_result testrepo $the_commit heads/frotz &&
|
2007-07-01 15:48:54 +00:00
|
|
|
test 1 = $( cd testrepo && git show-ref | wc -l )
|
2007-06-09 08:37:14 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'push with colon-less refspec (4)' '
|
|
|
|
|
2013-04-02 07:40:31 +00:00
|
|
|
mk_test testrepo &&
|
2007-06-09 08:37:14 +00:00
|
|
|
if git show-ref --verify -q refs/heads/frotz
|
|
|
|
then
|
|
|
|
git branch -D frotz
|
|
|
|
fi &&
|
|
|
|
git tag -f frotz &&
|
|
|
|
git push testrepo frotz &&
|
2013-04-02 07:40:31 +00:00
|
|
|
check_push_result testrepo $the_commit tags/frotz &&
|
2007-07-01 15:48:54 +00:00
|
|
|
test 1 = $( cd testrepo && git show-ref | wc -l )
|
2007-06-09 08:37:14 +00:00
|
|
|
|
2007-06-09 08:23:53 +00:00
|
|
|
'
|
|
|
|
|
2011-06-16 13:42:48 +00:00
|
|
|
test_expect_success 'push head with non-existent, incomplete dest' '
|
push: allow unqualified dest refspecs to DWIM
Previously, a push like:
git push remote src:dst
would go through the following steps:
1. check for an unambiguous 'dst' on the remote; if it
exists, then push to that ref
2. otherwise, check if 'dst' begins with 'refs/'; if it
does, create a new ref
3. otherwise, complain because we don't know where in the
refs hierarchy to put 'dst'
However, in some cases, we can guess about the ref type of
'dst' based on the ref type of 'src'. Specifically, before
complaining we now check:
2.5. if 'src' resolves to a ref starting with refs/heads
or refs/tags, then prepend that to 'dst'
So now this creates a new branch on the remote, whereas it
previously failed with an error message:
git push master:newbranch
Note that, by design, we limit this DWIM behavior only to
source refs which resolve exactly (including symrefs which
resolve to existing refs). We still complain on a partial
destination refspec if the source is a raw sha1, or a ref
expression such as 'master~10'.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-23 09:16:06 +00:00
|
|
|
|
2013-04-02 07:40:31 +00:00
|
|
|
mk_test testrepo &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git push testrepo main:branch &&
|
2013-04-02 07:40:31 +00:00
|
|
|
check_push_result testrepo $the_commit heads/branch
|
push: allow unqualified dest refspecs to DWIM
Previously, a push like:
git push remote src:dst
would go through the following steps:
1. check for an unambiguous 'dst' on the remote; if it
exists, then push to that ref
2. otherwise, check if 'dst' begins with 'refs/'; if it
does, create a new ref
3. otherwise, complain because we don't know where in the
refs hierarchy to put 'dst'
However, in some cases, we can guess about the ref type of
'dst' based on the ref type of 'src'. Specifically, before
complaining we now check:
2.5. if 'src' resolves to a ref starting with refs/heads
or refs/tags, then prepend that to 'dst'
So now this creates a new branch on the remote, whereas it
previously failed with an error message:
git push master:newbranch
Note that, by design, we limit this DWIM behavior only to
source refs which resolve exactly (including symrefs which
resolve to existing refs). We still complain on a partial
destination refspec if the source is a raw sha1, or a ref
expression such as 'master~10'.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-23 09:16:06 +00:00
|
|
|
|
|
|
|
'
|
|
|
|
|
2011-06-16 13:42:48 +00:00
|
|
|
test_expect_success 'push tag with non-existent, incomplete dest' '
|
push: allow unqualified dest refspecs to DWIM
Previously, a push like:
git push remote src:dst
would go through the following steps:
1. check for an unambiguous 'dst' on the remote; if it
exists, then push to that ref
2. otherwise, check if 'dst' begins with 'refs/'; if it
does, create a new ref
3. otherwise, complain because we don't know where in the
refs hierarchy to put 'dst'
However, in some cases, we can guess about the ref type of
'dst' based on the ref type of 'src'. Specifically, before
complaining we now check:
2.5. if 'src' resolves to a ref starting with refs/heads
or refs/tags, then prepend that to 'dst'
So now this creates a new branch on the remote, whereas it
previously failed with an error message:
git push master:newbranch
Note that, by design, we limit this DWIM behavior only to
source refs which resolve exactly (including symrefs which
resolve to existing refs). We still complain on a partial
destination refspec if the source is a raw sha1, or a ref
expression such as 'master~10'.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-23 09:16:06 +00:00
|
|
|
|
2013-04-02 07:40:31 +00:00
|
|
|
mk_test testrepo &&
|
push: allow unqualified dest refspecs to DWIM
Previously, a push like:
git push remote src:dst
would go through the following steps:
1. check for an unambiguous 'dst' on the remote; if it
exists, then push to that ref
2. otherwise, check if 'dst' begins with 'refs/'; if it
does, create a new ref
3. otherwise, complain because we don't know where in the
refs hierarchy to put 'dst'
However, in some cases, we can guess about the ref type of
'dst' based on the ref type of 'src'. Specifically, before
complaining we now check:
2.5. if 'src' resolves to a ref starting with refs/heads
or refs/tags, then prepend that to 'dst'
So now this creates a new branch on the remote, whereas it
previously failed with an error message:
git push master:newbranch
Note that, by design, we limit this DWIM behavior only to
source refs which resolve exactly (including symrefs which
resolve to existing refs). We still complain on a partial
destination refspec if the source is a raw sha1, or a ref
expression such as 'master~10'.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-23 09:16:06 +00:00
|
|
|
git tag -f v1.0 &&
|
|
|
|
git push testrepo v1.0:tag &&
|
2013-04-02 07:40:31 +00:00
|
|
|
check_push_result testrepo $the_commit tags/tag
|
push: allow unqualified dest refspecs to DWIM
Previously, a push like:
git push remote src:dst
would go through the following steps:
1. check for an unambiguous 'dst' on the remote; if it
exists, then push to that ref
2. otherwise, check if 'dst' begins with 'refs/'; if it
does, create a new ref
3. otherwise, complain because we don't know where in the
refs hierarchy to put 'dst'
However, in some cases, we can guess about the ref type of
'dst' based on the ref type of 'src'. Specifically, before
complaining we now check:
2.5. if 'src' resolves to a ref starting with refs/heads
or refs/tags, then prepend that to 'dst'
So now this creates a new branch on the remote, whereas it
previously failed with an error message:
git push master:newbranch
Note that, by design, we limit this DWIM behavior only to
source refs which resolve exactly (including symrefs which
resolve to existing refs). We still complain on a partial
destination refspec if the source is a raw sha1, or a ref
expression such as 'master~10'.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-23 09:16:06 +00:00
|
|
|
|
|
|
|
'
|
|
|
|
|
2011-06-16 13:42:48 +00:00
|
|
|
test_expect_success 'push sha1 with non-existent, incomplete dest' '
|
push: allow unqualified dest refspecs to DWIM
Previously, a push like:
git push remote src:dst
would go through the following steps:
1. check for an unambiguous 'dst' on the remote; if it
exists, then push to that ref
2. otherwise, check if 'dst' begins with 'refs/'; if it
does, create a new ref
3. otherwise, complain because we don't know where in the
refs hierarchy to put 'dst'
However, in some cases, we can guess about the ref type of
'dst' based on the ref type of 'src'. Specifically, before
complaining we now check:
2.5. if 'src' resolves to a ref starting with refs/heads
or refs/tags, then prepend that to 'dst'
So now this creates a new branch on the remote, whereas it
previously failed with an error message:
git push master:newbranch
Note that, by design, we limit this DWIM behavior only to
source refs which resolve exactly (including symrefs which
resolve to existing refs). We still complain on a partial
destination refspec if the source is a raw sha1, or a ref
expression such as 'master~10'.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-23 09:16:06 +00:00
|
|
|
|
2013-04-02 07:40:31 +00:00
|
|
|
mk_test testrepo &&
|
2020-11-18 23:44:32 +00:00
|
|
|
test_must_fail git push testrepo $(git rev-parse main):foo
|
push: allow unqualified dest refspecs to DWIM
Previously, a push like:
git push remote src:dst
would go through the following steps:
1. check for an unambiguous 'dst' on the remote; if it
exists, then push to that ref
2. otherwise, check if 'dst' begins with 'refs/'; if it
does, create a new ref
3. otherwise, complain because we don't know where in the
refs hierarchy to put 'dst'
However, in some cases, we can guess about the ref type of
'dst' based on the ref type of 'src'. Specifically, before
complaining we now check:
2.5. if 'src' resolves to a ref starting with refs/heads
or refs/tags, then prepend that to 'dst'
So now this creates a new branch on the remote, whereas it
previously failed with an error message:
git push master:newbranch
Note that, by design, we limit this DWIM behavior only to
source refs which resolve exactly (including symrefs which
resolve to existing refs). We still complain on a partial
destination refspec if the source is a raw sha1, or a ref
expression such as 'master~10'.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-23 09:16:06 +00:00
|
|
|
|
|
|
|
'
|
|
|
|
|
2011-06-16 13:42:48 +00:00
|
|
|
test_expect_success 'push ref expression with non-existent, incomplete dest' '
|
push: allow unqualified dest refspecs to DWIM
Previously, a push like:
git push remote src:dst
would go through the following steps:
1. check for an unambiguous 'dst' on the remote; if it
exists, then push to that ref
2. otherwise, check if 'dst' begins with 'refs/'; if it
does, create a new ref
3. otherwise, complain because we don't know where in the
refs hierarchy to put 'dst'
However, in some cases, we can guess about the ref type of
'dst' based on the ref type of 'src'. Specifically, before
complaining we now check:
2.5. if 'src' resolves to a ref starting with refs/heads
or refs/tags, then prepend that to 'dst'
So now this creates a new branch on the remote, whereas it
previously failed with an error message:
git push master:newbranch
Note that, by design, we limit this DWIM behavior only to
source refs which resolve exactly (including symrefs which
resolve to existing refs). We still complain on a partial
destination refspec if the source is a raw sha1, or a ref
expression such as 'master~10'.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-23 09:16:06 +00:00
|
|
|
|
2013-04-02 07:40:31 +00:00
|
|
|
mk_test testrepo &&
|
2020-11-18 23:44:32 +00:00
|
|
|
test_must_fail git push testrepo main^:branch
|
push: allow unqualified dest refspecs to DWIM
Previously, a push like:
git push remote src:dst
would go through the following steps:
1. check for an unambiguous 'dst' on the remote; if it
exists, then push to that ref
2. otherwise, check if 'dst' begins with 'refs/'; if it
does, create a new ref
3. otherwise, complain because we don't know where in the
refs hierarchy to put 'dst'
However, in some cases, we can guess about the ref type of
'dst' based on the ref type of 'src'. Specifically, before
complaining we now check:
2.5. if 'src' resolves to a ref starting with refs/heads
or refs/tags, then prepend that to 'dst'
So now this creates a new branch on the remote, whereas it
previously failed with an error message:
git push master:newbranch
Note that, by design, we limit this DWIM behavior only to
source refs which resolve exactly (including symrefs which
resolve to existing refs). We still complain on a partial
destination refspec if the source is a raw sha1, or a ref
expression such as 'master~10'.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-23 09:16:06 +00:00
|
|
|
|
|
|
|
'
|
|
|
|
|
2020-11-26 00:16:16 +00:00
|
|
|
for head in HEAD @
|
|
|
|
do
|
|
|
|
|
|
|
|
test_expect_success "push with $head" '
|
2021-01-25 22:19:18 +00:00
|
|
|
mk_test testrepo heads/main &&
|
|
|
|
git checkout main &&
|
2020-11-26 00:16:16 +00:00
|
|
|
git push testrepo $head &&
|
2021-01-25 22:19:18 +00:00
|
|
|
check_push_result testrepo $the_commit heads/main
|
2020-11-26 00:16:16 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success "push with $head nonexisting at remote" '
|
2021-01-25 22:19:18 +00:00
|
|
|
mk_test testrepo heads/main &&
|
|
|
|
git checkout -b local main &&
|
|
|
|
test_when_finished "git checkout main; git branch -D local" &&
|
2020-11-26 00:16:16 +00:00
|
|
|
git push testrepo $head &&
|
|
|
|
check_push_result testrepo $the_commit heads/local
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success "push with +$head" '
|
2021-01-25 22:19:18 +00:00
|
|
|
mk_test testrepo heads/main &&
|
|
|
|
git checkout -b local main &&
|
|
|
|
test_when_finished "git checkout main; git branch -D local" &&
|
|
|
|
git push testrepo main local &&
|
|
|
|
check_push_result testrepo $the_commit heads/main &&
|
2020-11-26 00:16:16 +00:00
|
|
|
check_push_result testrepo $the_commit heads/local &&
|
|
|
|
|
|
|
|
# Without force rewinding should fail
|
|
|
|
git reset --hard $head^ &&
|
|
|
|
test_must_fail git push testrepo $head &&
|
|
|
|
check_push_result testrepo $the_commit heads/local &&
|
|
|
|
|
|
|
|
# With force rewinding should succeed
|
|
|
|
git push testrepo +$head &&
|
|
|
|
check_push_result testrepo $the_first_commit heads/local
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success "push $head with non-existent, incomplete dest" '
|
|
|
|
mk_test testrepo &&
|
2021-01-25 22:19:18 +00:00
|
|
|
git checkout main &&
|
2020-11-26 00:16:16 +00:00
|
|
|
git push testrepo $head:branch &&
|
|
|
|
check_push_result testrepo $the_commit heads/branch
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success "push with config remote.*.push = $head" '
|
|
|
|
mk_test testrepo heads/local &&
|
2021-01-25 22:19:18 +00:00
|
|
|
git checkout main &&
|
2020-11-26 00:16:16 +00:00
|
|
|
git branch -f local $the_commit &&
|
|
|
|
test_when_finished "git branch -D local" &&
|
|
|
|
(
|
|
|
|
cd testrepo &&
|
|
|
|
git checkout local &&
|
|
|
|
git reset --hard $the_first_commit
|
|
|
|
) &&
|
|
|
|
test_config remote.there.url testrepo &&
|
|
|
|
test_config remote.there.push $head &&
|
2021-01-25 22:19:18 +00:00
|
|
|
test_config branch.main.remote there &&
|
2020-11-26 00:16:16 +00:00
|
|
|
git push &&
|
2021-01-25 22:19:18 +00:00
|
|
|
check_push_result testrepo $the_commit heads/main &&
|
2020-11-26 00:16:16 +00:00
|
|
|
check_push_result testrepo $the_first_commit heads/local
|
|
|
|
'
|
|
|
|
|
|
|
|
done
|
2008-02-20 17:54:05 +00:00
|
|
|
|
2021-11-18 00:53:21 +00:00
|
|
|
test_expect_success "push to remote with no explicit refspec and config remote.*.push = src:dest" '
|
|
|
|
mk_test testrepo heads/main &&
|
|
|
|
git checkout $the_first_commit &&
|
|
|
|
test_config remote.there.url testrepo &&
|
|
|
|
test_config remote.there.push refs/heads/main:refs/heads/main &&
|
|
|
|
git push there &&
|
|
|
|
check_push_result testrepo $the_commit heads/main
|
|
|
|
'
|
|
|
|
|
2013-04-02 07:40:33 +00:00
|
|
|
test_expect_success 'push with remote.pushdefault' '
|
2020-11-18 23:44:32 +00:00
|
|
|
mk_test up_repo heads/main &&
|
|
|
|
mk_test down_repo heads/main &&
|
2013-04-02 07:40:33 +00:00
|
|
|
test_config remote.up.url up_repo &&
|
|
|
|
test_config remote.down.url down_repo &&
|
2020-11-18 23:44:32 +00:00
|
|
|
test_config branch.main.remote up &&
|
2013-04-02 07:40:33 +00:00
|
|
|
test_config remote.pushdefault down &&
|
2013-04-18 18:47:59 +00:00
|
|
|
test_config push.default matching &&
|
2013-04-02 07:40:33 +00:00
|
|
|
git push &&
|
2020-11-18 23:44:32 +00:00
|
|
|
check_push_result up_repo $the_first_commit heads/main &&
|
|
|
|
check_push_result down_repo $the_commit heads/main
|
2008-02-20 17:54:05 +00:00
|
|
|
'
|
|
|
|
|
2009-06-09 16:01:35 +00:00
|
|
|
test_expect_success 'push with config remote.*.pushurl' '
|
|
|
|
|
2020-11-18 23:44:32 +00:00
|
|
|
mk_test testrepo heads/main &&
|
|
|
|
git checkout main &&
|
2013-03-18 23:12:11 +00:00
|
|
|
test_config remote.there.url test2repo &&
|
|
|
|
test_config remote.there.pushurl testrepo &&
|
2013-01-05 00:08:26 +00:00
|
|
|
git push there : &&
|
2020-11-18 23:44:32 +00:00
|
|
|
check_push_result testrepo $the_commit heads/main
|
2009-06-09 16:01:35 +00:00
|
|
|
'
|
|
|
|
|
2013-04-02 07:40:34 +00:00
|
|
|
test_expect_success 'push with config branch.*.pushremote' '
|
2020-11-18 23:44:32 +00:00
|
|
|
mk_test up_repo heads/main &&
|
|
|
|
mk_test side_repo heads/main &&
|
|
|
|
mk_test down_repo heads/main &&
|
2013-04-02 07:40:34 +00:00
|
|
|
test_config remote.up.url up_repo &&
|
|
|
|
test_config remote.pushdefault side_repo &&
|
|
|
|
test_config remote.down.url down_repo &&
|
2020-11-18 23:44:32 +00:00
|
|
|
test_config branch.main.remote up &&
|
|
|
|
test_config branch.main.pushremote down &&
|
2013-04-18 18:47:59 +00:00
|
|
|
test_config push.default matching &&
|
2013-04-02 07:40:34 +00:00
|
|
|
git push &&
|
2020-11-18 23:44:32 +00:00
|
|
|
check_push_result up_repo $the_first_commit heads/main &&
|
|
|
|
check_push_result side_repo $the_first_commit heads/main &&
|
|
|
|
check_push_result down_repo $the_commit heads/main
|
2009-06-09 16:01:35 +00:00
|
|
|
'
|
|
|
|
|
2014-02-24 08:59:03 +00:00
|
|
|
test_expect_success 'branch.*.pushremote config order is irrelevant' '
|
2020-11-18 23:44:32 +00:00
|
|
|
mk_test one_repo heads/main &&
|
|
|
|
mk_test two_repo heads/main &&
|
2014-02-24 08:59:03 +00:00
|
|
|
test_config remote.one.url one_repo &&
|
|
|
|
test_config remote.two.url two_repo &&
|
2020-11-18 23:44:32 +00:00
|
|
|
test_config branch.main.pushremote two_repo &&
|
2014-02-24 08:59:03 +00:00
|
|
|
test_config remote.pushdefault one_repo &&
|
|
|
|
test_config push.default matching &&
|
|
|
|
git push &&
|
2020-11-18 23:44:32 +00:00
|
|
|
check_push_result one_repo $the_first_commit heads/main &&
|
|
|
|
check_push_result two_repo $the_commit heads/main
|
2014-02-24 08:59:03 +00:00
|
|
|
'
|
|
|
|
|
2022-05-31 23:12:34 +00:00
|
|
|
test_expect_success 'push rejects empty branch name entries' '
|
remote.c: don't BUG() on 0-length branch names
4a2dcb1a08 (remote: die if branch is not found in repository,
2021-11-17) introduced a regression where multiple config entries with
an empty branch name, e.g.
[branch ""]
remote = foo
merge = bar
could cause Git to fail when it tries to look up branch tracking
information.
We parse the config key to get (branch name, branch name length), but
when the branch name subsection is empty, we get a bogus branch name,
e.g. "branch..remote" gives (".remote", 0). We continue to use the bogus
branch name as if it were valid, and prior to 4a2dcb1a08, this wasn't an
issue because length = 0 caused the branch name to effectively be ""
everywhere.
However, that commit handles length = 0 inconsistently when we create
the branch:
- When find_branch() is called to check if the branch exists in the
branch hash map, it interprets a length of 0 to mean that it should
call strlen on the char pointer.
- But the code path that inserts into the branch hash map interprets a
length of 0 to mean that the string is 0-length.
This results in the bug described above:
- "branch..remote" looks for ".remote" in the branch hash map. Since we
do not find it, we insert the "" entry into the hash map.
- "branch..merge" looks for ".merge" in the branch hash map. Since we
do not find it, we again try to insert the "" entry into the hash map.
However, the entries in the branch hash map are supposed to be
appended to, not overwritten.
- Since overwriting an entry is a BUG(), Git fails instead of silently
ignoring the empty branch name.
Fix the bug by removing the convenience strlen functionality, so that
0 means that the string is 0-length. We still insert a bogus branch name
into the hash map, but this will be fixed in a later commit.
Reported-by: "Ing. Martin Prantl Ph.D." <perry@ntis.zcu.cz>
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Glen Choo <chooglen@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-05-31 23:12:33 +00:00
|
|
|
mk_test one_repo heads/main &&
|
|
|
|
test_config remote.one.url one_repo &&
|
|
|
|
test_config branch..remote one &&
|
|
|
|
test_config branch..merge refs/heads/ &&
|
|
|
|
test_config branch.main.remote one &&
|
|
|
|
test_config branch.main.merge refs/heads/main &&
|
2022-05-31 23:12:34 +00:00
|
|
|
test_must_fail git push 2>err &&
|
|
|
|
grep "bad config variable .branch\.\." err
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'push ignores "branch." config without subsection' '
|
|
|
|
mk_test one_repo heads/main &&
|
|
|
|
test_config remote.one.url one_repo &&
|
|
|
|
test_config branch.autoSetupMerge true &&
|
|
|
|
test_config branch.main.remote one &&
|
|
|
|
test_config branch.main.merge refs/heads/main &&
|
remote.c: don't BUG() on 0-length branch names
4a2dcb1a08 (remote: die if branch is not found in repository,
2021-11-17) introduced a regression where multiple config entries with
an empty branch name, e.g.
[branch ""]
remote = foo
merge = bar
could cause Git to fail when it tries to look up branch tracking
information.
We parse the config key to get (branch name, branch name length), but
when the branch name subsection is empty, we get a bogus branch name,
e.g. "branch..remote" gives (".remote", 0). We continue to use the bogus
branch name as if it were valid, and prior to 4a2dcb1a08, this wasn't an
issue because length = 0 caused the branch name to effectively be ""
everywhere.
However, that commit handles length = 0 inconsistently when we create
the branch:
- When find_branch() is called to check if the branch exists in the
branch hash map, it interprets a length of 0 to mean that it should
call strlen on the char pointer.
- But the code path that inserts into the branch hash map interprets a
length of 0 to mean that the string is 0-length.
This results in the bug described above:
- "branch..remote" looks for ".remote" in the branch hash map. Since we
do not find it, we insert the "" entry into the hash map.
- "branch..merge" looks for ".merge" in the branch hash map. Since we
do not find it, we again try to insert the "" entry into the hash map.
However, the entries in the branch hash map are supposed to be
appended to, not overwritten.
- Since overwriting an entry is a BUG(), Git fails instead of silently
ignoring the empty branch name.
Fix the bug by removing the convenience strlen functionality, so that
0 means that the string is 0-length. We still insert a bogus branch name
into the hash map, but this will be fixed in a later commit.
Reported-by: "Ing. Martin Prantl Ph.D." <perry@ntis.zcu.cz>
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Glen Choo <chooglen@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-05-31 23:12:33 +00:00
|
|
|
git push
|
|
|
|
'
|
|
|
|
|
2007-10-11 19:32:27 +00:00
|
|
|
test_expect_success 'push with dry-run' '
|
|
|
|
|
2020-11-18 23:44:32 +00:00
|
|
|
mk_test testrepo heads/main &&
|
|
|
|
old_commit=$(git -C testrepo show-ref -s --verify refs/heads/main) &&
|
2013-01-05 00:08:26 +00:00
|
|
|
git push --dry-run testrepo : &&
|
2020-11-18 23:44:32 +00:00
|
|
|
check_push_result testrepo $old_commit heads/main
|
2007-10-11 19:32:27 +00:00
|
|
|
'
|
|
|
|
|
2007-11-29 01:02:53 +00:00
|
|
|
test_expect_success 'push updates local refs' '
|
|
|
|
|
2020-11-18 23:44:32 +00:00
|
|
|
mk_test testrepo heads/main &&
|
2013-04-02 07:40:31 +00:00
|
|
|
mk_child testrepo child &&
|
2010-04-19 22:08:31 +00:00
|
|
|
(
|
|
|
|
cd child &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git pull .. main &&
|
2007-11-29 01:02:53 +00:00
|
|
|
git push &&
|
2020-11-18 23:44:32 +00:00
|
|
|
test $(git rev-parse main) = \
|
|
|
|
$(git rev-parse remotes/origin/main)
|
2010-04-19 22:08:31 +00:00
|
|
|
)
|
2007-11-29 01:02:53 +00:00
|
|
|
|
|
|
|
'
|
|
|
|
|
2008-11-05 20:55:54 +00:00
|
|
|
test_expect_success 'push updates up-to-date local refs' '
|
|
|
|
|
2020-11-18 23:44:32 +00:00
|
|
|
mk_test testrepo heads/main &&
|
2013-04-02 07:40:31 +00:00
|
|
|
mk_child testrepo child1 &&
|
|
|
|
mk_child testrepo child2 &&
|
2020-11-18 23:44:32 +00:00
|
|
|
(cd child1 && git pull .. main && git push) &&
|
2010-04-19 22:08:31 +00:00
|
|
|
(
|
|
|
|
cd child2 &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git pull ../child1 main &&
|
2008-11-05 20:55:54 +00:00
|
|
|
git push &&
|
2020-11-18 23:44:32 +00:00
|
|
|
test $(git rev-parse main) = \
|
|
|
|
$(git rev-parse remotes/origin/main)
|
2010-04-19 22:08:31 +00:00
|
|
|
)
|
2008-11-05 20:55:54 +00:00
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'push preserves up-to-date packed refs' '
|
|
|
|
|
2020-11-18 23:44:32 +00:00
|
|
|
mk_test testrepo heads/main &&
|
2013-04-02 07:40:31 +00:00
|
|
|
mk_child testrepo child &&
|
2010-04-19 22:08:31 +00:00
|
|
|
(
|
|
|
|
cd child &&
|
2008-11-05 20:55:54 +00:00
|
|
|
git push &&
|
2020-11-18 23:44:32 +00:00
|
|
|
! test -f .git/refs/remotes/origin/main
|
2010-04-19 22:08:31 +00:00
|
|
|
)
|
2008-11-05 20:55:54 +00:00
|
|
|
|
|
|
|
'
|
|
|
|
|
2007-11-29 01:02:53 +00:00
|
|
|
test_expect_success 'push does not update local refs on failure' '
|
|
|
|
|
2020-11-18 23:44:32 +00:00
|
|
|
mk_test testrepo heads/main &&
|
2013-04-02 07:40:31 +00:00
|
|
|
mk_child testrepo child &&
|
2010-05-20 18:57:52 +00:00
|
|
|
echo "#!/no/frobnication/today" >testrepo/.git/hooks/pre-receive &&
|
2008-11-07 22:20:33 +00:00
|
|
|
chmod +x testrepo/.git/hooks/pre-receive &&
|
2010-04-19 22:08:31 +00:00
|
|
|
(
|
|
|
|
cd child &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git pull .. main &&
|
2008-07-12 15:47:52 +00:00
|
|
|
test_must_fail git push &&
|
2020-11-18 23:44:32 +00:00
|
|
|
test $(git rev-parse main) != \
|
|
|
|
$(git rev-parse remotes/origin/main)
|
2010-04-19 22:08:31 +00:00
|
|
|
)
|
2007-11-29 01:02:53 +00:00
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'allow deleting an invalid remote ref' '
|
|
|
|
|
2021-09-24 18:33:00 +00:00
|
|
|
mk_test testrepo heads/branch &&
|
2007-11-29 01:02:53 +00:00
|
|
|
rm -f testrepo/.git/objects/??/* &&
|
2021-09-24 18:33:00 +00:00
|
|
|
git push testrepo :refs/heads/branch &&
|
|
|
|
(cd testrepo && test_must_fail git rev-parse --verify refs/heads/branch)
|
2007-11-29 01:02:53 +00:00
|
|
|
|
|
|
|
'
|
|
|
|
|
2011-09-28 15:39:35 +00:00
|
|
|
test_expect_success 'pushing valid refs triggers post-receive and post-update hooks' '
|
2020-11-18 23:44:32 +00:00
|
|
|
mk_test_with_hooks testrepo heads/main heads/next &&
|
|
|
|
orgmain=$(cd testrepo && git show-ref -s --verify refs/heads/main) &&
|
|
|
|
newmain=$(git show-ref -s --verify refs/heads/main) &&
|
2011-09-28 15:39:35 +00:00
|
|
|
orgnext=$(cd testrepo && git show-ref -s --verify refs/heads/next) &&
|
2018-05-13 02:24:13 +00:00
|
|
|
newnext=$ZERO_OID &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git push testrepo refs/heads/main:refs/heads/main :refs/heads/next &&
|
2011-09-28 15:39:35 +00:00
|
|
|
(
|
|
|
|
cd testrepo/.git &&
|
|
|
|
cat >pre-receive.expect <<-EOF &&
|
2020-11-18 23:44:32 +00:00
|
|
|
$orgmain $newmain refs/heads/main
|
2011-09-28 15:39:35 +00:00
|
|
|
$orgnext $newnext refs/heads/next
|
|
|
|
EOF
|
|
|
|
|
|
|
|
cat >update.expect <<-EOF &&
|
2020-11-18 23:44:32 +00:00
|
|
|
refs/heads/main $orgmain $newmain
|
2011-09-28 15:39:35 +00:00
|
|
|
refs/heads/next $orgnext $newnext
|
|
|
|
EOF
|
|
|
|
|
|
|
|
cat >post-receive.expect <<-EOF &&
|
2020-11-18 23:44:32 +00:00
|
|
|
$orgmain $newmain refs/heads/main
|
2011-09-28 15:39:35 +00:00
|
|
|
$orgnext $newnext refs/heads/next
|
|
|
|
EOF
|
|
|
|
|
|
|
|
cat >post-update.expect <<-EOF &&
|
2020-11-18 23:44:32 +00:00
|
|
|
refs/heads/main
|
2011-09-28 15:39:35 +00:00
|
|
|
refs/heads/next
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_cmp pre-receive.expect pre-receive.actual &&
|
|
|
|
test_cmp update.expect update.actual &&
|
|
|
|
test_cmp post-receive.expect post-receive.actual &&
|
|
|
|
test_cmp post-update.expect post-update.actual
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'deleting dangling ref triggers hooks with correct args' '
|
2021-09-24 18:33:00 +00:00
|
|
|
mk_test_with_hooks testrepo heads/branch &&
|
refs: turn on GIT_REF_PARANOIA by default
The original point of the GIT_REF_PARANOIA flag was to include broken
refs in iterations, so that possibly-destructive operations would not
silently ignore them (and would generally instead try to operate on the
oids and fail when the objects could not be accessed).
We already turned this on by default for some dangerous operations, like
"repack -ad" (where missing a reachability tip would mean dropping the
associated history). But it was not on for general use, even though it
could easily result in the spreading of corruption (e.g., imagine
cloning a repository which simply omits some of its refs because
their objects are missing; the result quietly succeeds even though you
did not clone everything!).
This patch turns on GIT_REF_PARANOIA by default. So a clone as mentioned
above would actually fail (upload-pack tells us about the broken ref,
and when we ask for the objects, pack-objects fails to deliver them).
This may be inconvenient when working with a corrupted repository, but:
- we are better off to err on the side of complaining about
corruption, and then provide mechanisms for explicitly loosening
safety.
- this is only one type of corruption anyway. If we are missing any
other objects in the history that _aren't_ ref tips, then we'd
behave similarly (happily show the ref, but then barf when we
started traversing).
We retain the GIT_REF_PARANOIA variable, but simply default it to "1"
instead of "0". That gives the user an escape hatch for loosening this
when working with a corrupt repository. It won't work across a remote
connection to upload-pack (because we can't necessarily set environment
variables on the remote), but there the client has other options (e.g.,
choosing which refs to fetch).
As a bonus, this also makes ref iteration faster in general (because we
don't have to call has_object_file() for each ref), though probably not
noticeably so in the general case. In a repo with a million refs, it
shaved a few hundred milliseconds off of upload-pack's advertisement;
that's noticeable, but most repos are not nearly that large.
The possible downside here is that any operation which iterates refs but
doesn't ever open their objects may now quietly claim to have X when the
object is corrupted (e.g., "git rev-list new-branch --not --all" will
treat a broken ref as uninteresting). But again, that's not really any
different than corruption below the ref level. We might have
refs/heads/old-branch as non-corrupt, but we are not actively checking
that we have the entire reachable history. Or the pointed-to object
could even be corrupted on-disk (but our "do we have it" check would
still succeed). In that sense, this is merely bringing ref-corruption in
line with general object corruption.
One alternative implementation would be to actually check for broken
refs, and then _immediately die_ if we see any. That would cause the
"rev-list --not --all" case above to abort immediately. But in many ways
that's the worst of all worlds:
- it still spends time looking up the objects an extra time
- it still doesn't catch corruption below the ref level
- it's even more inconvenient; with the current implementation of
GIT_REF_PARANOIA for something like upload-pack, we can make
the advertisement and let the client choose a non-broken piece of
history. If we bail as soon as we see a broken ref, they cannot even
see the advertisement.
The test changes here show some of the fallout. A non-destructive "git
repack -adk" now fails by default (but we can override it). Deleting a
broken ref now actually tells the hooks the correct "before" state,
rather than a confusing null oid.
Signed-off-by: Jeff King <peff@peff.net>
Reviewed-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-09-24 18:46:13 +00:00
|
|
|
orig=$(git -C testrepo rev-parse refs/heads/branch) &&
|
2011-09-28 15:39:35 +00:00
|
|
|
rm -f testrepo/.git/objects/??/* &&
|
2021-09-24 18:33:00 +00:00
|
|
|
git push testrepo :refs/heads/branch &&
|
2011-09-28 15:39:35 +00:00
|
|
|
(
|
|
|
|
cd testrepo/.git &&
|
|
|
|
cat >pre-receive.expect <<-EOF &&
|
refs: turn on GIT_REF_PARANOIA by default
The original point of the GIT_REF_PARANOIA flag was to include broken
refs in iterations, so that possibly-destructive operations would not
silently ignore them (and would generally instead try to operate on the
oids and fail when the objects could not be accessed).
We already turned this on by default for some dangerous operations, like
"repack -ad" (where missing a reachability tip would mean dropping the
associated history). But it was not on for general use, even though it
could easily result in the spreading of corruption (e.g., imagine
cloning a repository which simply omits some of its refs because
their objects are missing; the result quietly succeeds even though you
did not clone everything!).
This patch turns on GIT_REF_PARANOIA by default. So a clone as mentioned
above would actually fail (upload-pack tells us about the broken ref,
and when we ask for the objects, pack-objects fails to deliver them).
This may be inconvenient when working with a corrupted repository, but:
- we are better off to err on the side of complaining about
corruption, and then provide mechanisms for explicitly loosening
safety.
- this is only one type of corruption anyway. If we are missing any
other objects in the history that _aren't_ ref tips, then we'd
behave similarly (happily show the ref, but then barf when we
started traversing).
We retain the GIT_REF_PARANOIA variable, but simply default it to "1"
instead of "0". That gives the user an escape hatch for loosening this
when working with a corrupt repository. It won't work across a remote
connection to upload-pack (because we can't necessarily set environment
variables on the remote), but there the client has other options (e.g.,
choosing which refs to fetch).
As a bonus, this also makes ref iteration faster in general (because we
don't have to call has_object_file() for each ref), though probably not
noticeably so in the general case. In a repo with a million refs, it
shaved a few hundred milliseconds off of upload-pack's advertisement;
that's noticeable, but most repos are not nearly that large.
The possible downside here is that any operation which iterates refs but
doesn't ever open their objects may now quietly claim to have X when the
object is corrupted (e.g., "git rev-list new-branch --not --all" will
treat a broken ref as uninteresting). But again, that's not really any
different than corruption below the ref level. We might have
refs/heads/old-branch as non-corrupt, but we are not actively checking
that we have the entire reachable history. Or the pointed-to object
could even be corrupted on-disk (but our "do we have it" check would
still succeed). In that sense, this is merely bringing ref-corruption in
line with general object corruption.
One alternative implementation would be to actually check for broken
refs, and then _immediately die_ if we see any. That would cause the
"rev-list --not --all" case above to abort immediately. But in many ways
that's the worst of all worlds:
- it still spends time looking up the objects an extra time
- it still doesn't catch corruption below the ref level
- it's even more inconvenient; with the current implementation of
GIT_REF_PARANOIA for something like upload-pack, we can make
the advertisement and let the client choose a non-broken piece of
history. If we bail as soon as we see a broken ref, they cannot even
see the advertisement.
The test changes here show some of the fallout. A non-destructive "git
repack -adk" now fails by default (but we can override it). Deleting a
broken ref now actually tells the hooks the correct "before" state,
rather than a confusing null oid.
Signed-off-by: Jeff King <peff@peff.net>
Reviewed-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-09-24 18:46:13 +00:00
|
|
|
$orig $ZERO_OID refs/heads/branch
|
2011-09-28 15:39:35 +00:00
|
|
|
EOF
|
|
|
|
|
|
|
|
cat >update.expect <<-EOF &&
|
refs: turn on GIT_REF_PARANOIA by default
The original point of the GIT_REF_PARANOIA flag was to include broken
refs in iterations, so that possibly-destructive operations would not
silently ignore them (and would generally instead try to operate on the
oids and fail when the objects could not be accessed).
We already turned this on by default for some dangerous operations, like
"repack -ad" (where missing a reachability tip would mean dropping the
associated history). But it was not on for general use, even though it
could easily result in the spreading of corruption (e.g., imagine
cloning a repository which simply omits some of its refs because
their objects are missing; the result quietly succeeds even though you
did not clone everything!).
This patch turns on GIT_REF_PARANOIA by default. So a clone as mentioned
above would actually fail (upload-pack tells us about the broken ref,
and when we ask for the objects, pack-objects fails to deliver them).
This may be inconvenient when working with a corrupted repository, but:
- we are better off to err on the side of complaining about
corruption, and then provide mechanisms for explicitly loosening
safety.
- this is only one type of corruption anyway. If we are missing any
other objects in the history that _aren't_ ref tips, then we'd
behave similarly (happily show the ref, but then barf when we
started traversing).
We retain the GIT_REF_PARANOIA variable, but simply default it to "1"
instead of "0". That gives the user an escape hatch for loosening this
when working with a corrupt repository. It won't work across a remote
connection to upload-pack (because we can't necessarily set environment
variables on the remote), but there the client has other options (e.g.,
choosing which refs to fetch).
As a bonus, this also makes ref iteration faster in general (because we
don't have to call has_object_file() for each ref), though probably not
noticeably so in the general case. In a repo with a million refs, it
shaved a few hundred milliseconds off of upload-pack's advertisement;
that's noticeable, but most repos are not nearly that large.
The possible downside here is that any operation which iterates refs but
doesn't ever open their objects may now quietly claim to have X when the
object is corrupted (e.g., "git rev-list new-branch --not --all" will
treat a broken ref as uninteresting). But again, that's not really any
different than corruption below the ref level. We might have
refs/heads/old-branch as non-corrupt, but we are not actively checking
that we have the entire reachable history. Or the pointed-to object
could even be corrupted on-disk (but our "do we have it" check would
still succeed). In that sense, this is merely bringing ref-corruption in
line with general object corruption.
One alternative implementation would be to actually check for broken
refs, and then _immediately die_ if we see any. That would cause the
"rev-list --not --all" case above to abort immediately. But in many ways
that's the worst of all worlds:
- it still spends time looking up the objects an extra time
- it still doesn't catch corruption below the ref level
- it's even more inconvenient; with the current implementation of
GIT_REF_PARANOIA for something like upload-pack, we can make
the advertisement and let the client choose a non-broken piece of
history. If we bail as soon as we see a broken ref, they cannot even
see the advertisement.
The test changes here show some of the fallout. A non-destructive "git
repack -adk" now fails by default (but we can override it). Deleting a
broken ref now actually tells the hooks the correct "before" state,
rather than a confusing null oid.
Signed-off-by: Jeff King <peff@peff.net>
Reviewed-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-09-24 18:46:13 +00:00
|
|
|
refs/heads/branch $orig $ZERO_OID
|
2011-09-28 15:39:35 +00:00
|
|
|
EOF
|
|
|
|
|
|
|
|
cat >post-receive.expect <<-EOF &&
|
refs: turn on GIT_REF_PARANOIA by default
The original point of the GIT_REF_PARANOIA flag was to include broken
refs in iterations, so that possibly-destructive operations would not
silently ignore them (and would generally instead try to operate on the
oids and fail when the objects could not be accessed).
We already turned this on by default for some dangerous operations, like
"repack -ad" (where missing a reachability tip would mean dropping the
associated history). But it was not on for general use, even though it
could easily result in the spreading of corruption (e.g., imagine
cloning a repository which simply omits some of its refs because
their objects are missing; the result quietly succeeds even though you
did not clone everything!).
This patch turns on GIT_REF_PARANOIA by default. So a clone as mentioned
above would actually fail (upload-pack tells us about the broken ref,
and when we ask for the objects, pack-objects fails to deliver them).
This may be inconvenient when working with a corrupted repository, but:
- we are better off to err on the side of complaining about
corruption, and then provide mechanisms for explicitly loosening
safety.
- this is only one type of corruption anyway. If we are missing any
other objects in the history that _aren't_ ref tips, then we'd
behave similarly (happily show the ref, but then barf when we
started traversing).
We retain the GIT_REF_PARANOIA variable, but simply default it to "1"
instead of "0". That gives the user an escape hatch for loosening this
when working with a corrupt repository. It won't work across a remote
connection to upload-pack (because we can't necessarily set environment
variables on the remote), but there the client has other options (e.g.,
choosing which refs to fetch).
As a bonus, this also makes ref iteration faster in general (because we
don't have to call has_object_file() for each ref), though probably not
noticeably so in the general case. In a repo with a million refs, it
shaved a few hundred milliseconds off of upload-pack's advertisement;
that's noticeable, but most repos are not nearly that large.
The possible downside here is that any operation which iterates refs but
doesn't ever open their objects may now quietly claim to have X when the
object is corrupted (e.g., "git rev-list new-branch --not --all" will
treat a broken ref as uninteresting). But again, that's not really any
different than corruption below the ref level. We might have
refs/heads/old-branch as non-corrupt, but we are not actively checking
that we have the entire reachable history. Or the pointed-to object
could even be corrupted on-disk (but our "do we have it" check would
still succeed). In that sense, this is merely bringing ref-corruption in
line with general object corruption.
One alternative implementation would be to actually check for broken
refs, and then _immediately die_ if we see any. That would cause the
"rev-list --not --all" case above to abort immediately. But in many ways
that's the worst of all worlds:
- it still spends time looking up the objects an extra time
- it still doesn't catch corruption below the ref level
- it's even more inconvenient; with the current implementation of
GIT_REF_PARANOIA for something like upload-pack, we can make
the advertisement and let the client choose a non-broken piece of
history. If we bail as soon as we see a broken ref, they cannot even
see the advertisement.
The test changes here show some of the fallout. A non-destructive "git
repack -adk" now fails by default (but we can override it). Deleting a
broken ref now actually tells the hooks the correct "before" state,
rather than a confusing null oid.
Signed-off-by: Jeff King <peff@peff.net>
Reviewed-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-09-24 18:46:13 +00:00
|
|
|
$orig $ZERO_OID refs/heads/branch
|
2011-09-28 15:39:35 +00:00
|
|
|
EOF
|
|
|
|
|
|
|
|
cat >post-update.expect <<-EOF &&
|
2021-09-24 18:33:00 +00:00
|
|
|
refs/heads/branch
|
2011-09-28 15:39:35 +00:00
|
|
|
EOF
|
|
|
|
|
|
|
|
test_cmp pre-receive.expect pre-receive.actual &&
|
|
|
|
test_cmp update.expect update.actual &&
|
|
|
|
test_cmp post-receive.expect post-receive.actual &&
|
|
|
|
test_cmp post-update.expect post-update.actual
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'deletion of a non-existent ref is not fed to post-receive and post-update hooks' '
|
2020-11-18 23:44:32 +00:00
|
|
|
mk_test_with_hooks testrepo heads/main &&
|
|
|
|
orgmain=$(cd testrepo && git show-ref -s --verify refs/heads/main) &&
|
|
|
|
newmain=$(git show-ref -s --verify refs/heads/main) &&
|
|
|
|
git push testrepo main :refs/heads/nonexistent &&
|
2011-09-28 15:39:35 +00:00
|
|
|
(
|
|
|
|
cd testrepo/.git &&
|
|
|
|
cat >pre-receive.expect <<-EOF &&
|
2020-11-18 23:44:32 +00:00
|
|
|
$orgmain $newmain refs/heads/main
|
2018-05-13 02:24:13 +00:00
|
|
|
$ZERO_OID $ZERO_OID refs/heads/nonexistent
|
2011-09-28 15:39:35 +00:00
|
|
|
EOF
|
|
|
|
|
|
|
|
cat >update.expect <<-EOF &&
|
2020-11-18 23:44:32 +00:00
|
|
|
refs/heads/main $orgmain $newmain
|
2018-05-13 02:24:13 +00:00
|
|
|
refs/heads/nonexistent $ZERO_OID $ZERO_OID
|
2011-09-28 15:39:35 +00:00
|
|
|
EOF
|
|
|
|
|
|
|
|
cat >post-receive.expect <<-EOF &&
|
2020-11-18 23:44:32 +00:00
|
|
|
$orgmain $newmain refs/heads/main
|
2011-09-28 15:39:35 +00:00
|
|
|
EOF
|
|
|
|
|
|
|
|
cat >post-update.expect <<-EOF &&
|
2020-11-18 23:44:32 +00:00
|
|
|
refs/heads/main
|
2011-09-28 15:39:35 +00:00
|
|
|
EOF
|
|
|
|
|
|
|
|
test_cmp pre-receive.expect pre-receive.actual &&
|
|
|
|
test_cmp update.expect update.actual &&
|
|
|
|
test_cmp post-receive.expect post-receive.actual &&
|
|
|
|
test_cmp post-update.expect post-update.actual
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'deletion of a non-existent ref alone does trigger post-receive and post-update hooks' '
|
2020-11-18 23:44:32 +00:00
|
|
|
mk_test_with_hooks testrepo heads/main &&
|
2011-09-28 15:39:35 +00:00
|
|
|
git push testrepo :refs/heads/nonexistent &&
|
|
|
|
(
|
|
|
|
cd testrepo/.git &&
|
|
|
|
cat >pre-receive.expect <<-EOF &&
|
2018-05-13 02:24:13 +00:00
|
|
|
$ZERO_OID $ZERO_OID refs/heads/nonexistent
|
2011-09-28 15:39:35 +00:00
|
|
|
EOF
|
|
|
|
|
|
|
|
cat >update.expect <<-EOF &&
|
2018-05-13 02:24:13 +00:00
|
|
|
refs/heads/nonexistent $ZERO_OID $ZERO_OID
|
2011-09-28 15:39:35 +00:00
|
|
|
EOF
|
|
|
|
|
|
|
|
test_cmp pre-receive.expect pre-receive.actual &&
|
|
|
|
test_cmp update.expect update.actual &&
|
|
|
|
test_path_is_missing post-receive.actual &&
|
|
|
|
test_path_is_missing post-update.actual
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'mixed ref updates, deletes, invalid deletes trigger hooks with correct input' '
|
2020-11-18 23:44:32 +00:00
|
|
|
mk_test_with_hooks testrepo heads/main heads/next heads/seen &&
|
|
|
|
orgmain=$(cd testrepo && git show-ref -s --verify refs/heads/main) &&
|
|
|
|
newmain=$(git show-ref -s --verify refs/heads/main) &&
|
2011-09-28 15:39:35 +00:00
|
|
|
orgnext=$(cd testrepo && git show-ref -s --verify refs/heads/next) &&
|
2018-05-13 02:24:13 +00:00
|
|
|
newnext=$ZERO_OID &&
|
2020-06-25 12:18:59 +00:00
|
|
|
orgseen=$(cd testrepo && git show-ref -s --verify refs/heads/seen) &&
|
2020-11-18 23:44:32 +00:00
|
|
|
newseen=$(git show-ref -s --verify refs/heads/main) &&
|
|
|
|
git push testrepo refs/heads/main:refs/heads/main \
|
|
|
|
refs/heads/main:refs/heads/seen :refs/heads/next \
|
2011-09-28 15:39:35 +00:00
|
|
|
:refs/heads/nonexistent &&
|
|
|
|
(
|
|
|
|
cd testrepo/.git &&
|
|
|
|
cat >pre-receive.expect <<-EOF &&
|
2020-11-18 23:44:32 +00:00
|
|
|
$orgmain $newmain refs/heads/main
|
2011-09-28 15:39:35 +00:00
|
|
|
$orgnext $newnext refs/heads/next
|
2020-06-25 12:18:59 +00:00
|
|
|
$orgseen $newseen refs/heads/seen
|
2018-05-13 02:24:13 +00:00
|
|
|
$ZERO_OID $ZERO_OID refs/heads/nonexistent
|
2011-09-28 15:39:35 +00:00
|
|
|
EOF
|
|
|
|
|
|
|
|
cat >update.expect <<-EOF &&
|
2020-11-18 23:44:32 +00:00
|
|
|
refs/heads/main $orgmain $newmain
|
2011-09-28 15:39:35 +00:00
|
|
|
refs/heads/next $orgnext $newnext
|
2020-06-25 12:18:59 +00:00
|
|
|
refs/heads/seen $orgseen $newseen
|
2018-05-13 02:24:13 +00:00
|
|
|
refs/heads/nonexistent $ZERO_OID $ZERO_OID
|
2011-09-28 15:39:35 +00:00
|
|
|
EOF
|
|
|
|
|
|
|
|
cat >post-receive.expect <<-EOF &&
|
2020-11-18 23:44:32 +00:00
|
|
|
$orgmain $newmain refs/heads/main
|
2011-09-28 15:39:35 +00:00
|
|
|
$orgnext $newnext refs/heads/next
|
2020-06-25 12:18:59 +00:00
|
|
|
$orgseen $newseen refs/heads/seen
|
2011-09-28 15:39:35 +00:00
|
|
|
EOF
|
|
|
|
|
|
|
|
cat >post-update.expect <<-EOF &&
|
2020-11-18 23:44:32 +00:00
|
|
|
refs/heads/main
|
2011-09-28 15:39:35 +00:00
|
|
|
refs/heads/next
|
2020-06-25 12:18:59 +00:00
|
|
|
refs/heads/seen
|
2011-09-28 15:39:35 +00:00
|
|
|
EOF
|
|
|
|
|
|
|
|
test_cmp pre-receive.expect pre-receive.actual &&
|
|
|
|
test_cmp update.expect update.actual &&
|
|
|
|
test_cmp post-receive.expect post-receive.actual &&
|
|
|
|
test_cmp post-update.expect post-update.actual
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2009-12-30 19:57:42 +00:00
|
|
|
test_expect_success 'allow deleting a ref using --delete' '
|
2020-11-18 23:44:32 +00:00
|
|
|
mk_test testrepo heads/main &&
|
2009-12-30 19:57:42 +00:00
|
|
|
(cd testrepo && git config receive.denyDeleteCurrent warn) &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git push testrepo --delete main &&
|
|
|
|
(cd testrepo && test_must_fail git rev-parse --verify refs/heads/main)
|
2009-12-30 19:57:42 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'allow deleting a tag using --delete' '
|
2020-11-18 23:44:32 +00:00
|
|
|
mk_test testrepo heads/main &&
|
|
|
|
git tag -a -m dummy_message deltag heads/main &&
|
2009-12-30 19:57:42 +00:00
|
|
|
git push testrepo --tags &&
|
|
|
|
(cd testrepo && git rev-parse --verify -q refs/tags/deltag) &&
|
|
|
|
git push testrepo --delete tag deltag &&
|
|
|
|
(cd testrepo && test_must_fail git rev-parse --verify refs/tags/deltag)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'push --delete without args aborts' '
|
2020-11-18 23:44:32 +00:00
|
|
|
mk_test testrepo heads/main &&
|
2009-12-30 19:57:42 +00:00
|
|
|
test_must_fail git push testrepo --delete
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'push --delete refuses src:dest refspecs' '
|
2020-11-18 23:44:32 +00:00
|
|
|
mk_test testrepo heads/main &&
|
|
|
|
test_must_fail git push testrepo --delete main:foo
|
2009-12-30 19:57:42 +00:00
|
|
|
'
|
|
|
|
|
2021-02-23 23:13:32 +00:00
|
|
|
test_expect_success 'push --delete refuses empty string' '
|
|
|
|
mk_test testrepo heads/master &&
|
|
|
|
test_must_fail git push testrepo --delete ""
|
|
|
|
'
|
|
|
|
|
push: allow delete single-level ref
We discourage the creation/update of single-level refs
because some upper-layer applications only work in specified
reference namespaces, such as "refs/heads/*" or "refs/tags/*",
these single-level refnames may not be recognized. However,
we still hope users can delete them which have been created
by mistake.
Therefore, when updating branches on the server with
"git receive-pack", by checking whether it is a branch deletion
operation, it will determine whether to allow the update of
a single-level refs. This avoids creating/updating such
single-level refs, but allows them to be deleted.
On the client side, "git push" also does not properly fill in
the old-oid of single-level refs, which causes the server-side
"git receive-pack" to think that the ref's old-oid has changed
when deleting single-level refs, this causes the push to be
rejected. So the solution is to fix the client to be able to
delete single-level refs by properly filling old-oid.
Signed-off-by: ZheNing Hu <adlternative@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-03-01 10:20:29 +00:00
|
|
|
test_expect_success 'push --delete onelevel refspecs' '
|
|
|
|
mk_test testrepo heads/main &&
|
|
|
|
git -C testrepo update-ref refs/onelevel refs/heads/main &&
|
|
|
|
git push testrepo --delete refs/onelevel &&
|
|
|
|
test_must_fail git -C testrepo rev-parse --verify refs/onelevel
|
|
|
|
'
|
|
|
|
|
2008-11-09 01:49:27 +00:00
|
|
|
test_expect_success 'warn on push to HEAD of non-bare repository' '
|
2020-11-18 23:44:32 +00:00
|
|
|
mk_test testrepo heads/main &&
|
2010-04-19 22:08:31 +00:00
|
|
|
(
|
|
|
|
cd testrepo &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git checkout main &&
|
2010-04-19 22:08:31 +00:00
|
|
|
git config receive.denyCurrentBranch warn
|
|
|
|
) &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git push testrepo main 2>stderr &&
|
2009-02-01 01:34:05 +00:00
|
|
|
grep "warning: updating the current branch" stderr
|
2008-11-09 01:49:27 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'deny push to HEAD of non-bare repository' '
|
2020-11-18 23:44:32 +00:00
|
|
|
mk_test testrepo heads/main &&
|
2010-04-19 22:08:31 +00:00
|
|
|
(
|
|
|
|
cd testrepo &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git checkout main &&
|
2010-04-19 22:08:31 +00:00
|
|
|
git config receive.denyCurrentBranch true
|
|
|
|
) &&
|
2020-11-18 23:44:32 +00:00
|
|
|
test_must_fail git push testrepo main
|
2008-11-09 01:49:27 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'allow push to HEAD of bare repository (bare)' '
|
2020-11-18 23:44:32 +00:00
|
|
|
mk_test testrepo heads/main &&
|
2010-04-19 22:08:31 +00:00
|
|
|
(
|
|
|
|
cd testrepo &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git checkout main &&
|
2008-11-09 01:49:27 +00:00
|
|
|
git config receive.denyCurrentBranch true &&
|
2010-04-19 22:08:31 +00:00
|
|
|
git config core.bare true
|
|
|
|
) &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git push testrepo main 2>stderr &&
|
2009-02-01 01:34:05 +00:00
|
|
|
! grep "warning: updating the current branch" stderr
|
2008-11-09 01:49:27 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'allow push to HEAD of non-bare repository (config)' '
|
2020-11-18 23:44:32 +00:00
|
|
|
mk_test testrepo heads/main &&
|
2010-04-19 22:08:31 +00:00
|
|
|
(
|
|
|
|
cd testrepo &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git checkout main &&
|
2008-11-09 01:49:27 +00:00
|
|
|
git config receive.denyCurrentBranch false
|
|
|
|
) &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git push testrepo main 2>stderr &&
|
2009-02-01 01:34:05 +00:00
|
|
|
! grep "warning: updating the current branch" stderr
|
2008-11-09 01:49:27 +00:00
|
|
|
'
|
|
|
|
|
2008-11-10 21:47:11 +00:00
|
|
|
test_expect_success 'fetch with branches' '
|
2013-04-02 07:40:31 +00:00
|
|
|
mk_empty testrepo &&
|
2008-11-10 21:47:11 +00:00
|
|
|
git branch second $the_first_commit &&
|
|
|
|
git checkout second &&
|
tests: don't depend on template-created .git/branches
As noted in c8a58ac5a52 (Revert "Don't create the $GIT_DIR/branches
directory on init", 2009-10-31) there was an attempt long ago in
0cc5691a8b0 (Don't create the $GIT_DIR/branches directory on init,
2009-10-30) to get rid of the legacy "branches" directory.
We should probably get rid of its creation by removing the
"templates/branches--" file. But whatever our default behavior, our
tests should be tightened up to explicitly create the .git/branches
directory if they rely on our default templates, to make the
dependency on those templates clear.
So let's amend the two tests that would fail if .git/branches wasn't
created. To do this introduce a new "TEST_CREATE_REPO_NO_TEMPLATE"
variable, which we'll set before sourcing test-lib.sh, and change the
"git clone" and "git init" commands in the tests themselves to
explicitly pass "--template=".
This way they won't get a .git/branches in either their top-level
.git, or in the ones they create. We can then amend the tests that
rely on the ".git/branches" directory existing to create it
explicitly, and to remove it after its creation.
This new "TEST_CREATE_REPO_NO_TEMPLATE" variable is a less
heavy-handed version of the "NO_SET_GIT_TEMPLATE_DIR" variable. See
a94d305bf80 (t/t0001-init.sh: add test for 'init with init.templatedir
set', 2010-02-26) for its implementation.
Unlike "TEST_CREATE_REPO_NO_TEMPLATE", this new
"TEST_CREATE_REPO_NO_TEMPLATE" variable is narrowly scoped to what the
"git init" in test-lib.sh does, as opposed to the global effect of
"NO_SET_GIT_TEMPLATE_DIR" and the setting of "GIT_TEMPLATE_DIR" in
wrap-for-bin.sh.
I experimented with adding a new "GIT_WRAP_FOR_BIN_VIA_TEST_LIB"
variable set in test-lib.sh, which would cause wrap-for-bin.sh to not
set GIT_TEMPLATE_DIR, GITPERLLIB etc, as we set those in
test-lib.sh. I think that's a viable approach, but it would interact
e.g. with the appending feature of GITPERLLIB added in
8bade1e12e2 (wrap-for-bin: make bin-wrappers chainable, 2013-07-04).
Doing so would allow us to convert the tests in t0001-init.sh that now
use "NO_SET_GIT_TEMPLATE_DIR" to simply unset "GIT_TEMPLATE_DIR" in a
sub-shell before invoking "git init" or "git clone". I think that
approach is worth pursuing, but let's table it for now. Some future
wrap-for-bin.sh refactoring can try to address it.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-06-03 11:15:04 +00:00
|
|
|
mkdir testrepo/.git/branches &&
|
2008-11-10 21:47:11 +00:00
|
|
|
echo ".." > testrepo/.git/branches/branch1 &&
|
2010-04-19 22:08:31 +00:00
|
|
|
(
|
|
|
|
cd testrepo &&
|
2008-11-10 21:47:11 +00:00
|
|
|
git fetch branch1 &&
|
2013-03-18 23:13:41 +00:00
|
|
|
echo "$the_commit commit refs/heads/branch1" >expect &&
|
|
|
|
git for-each-ref refs/heads >actual &&
|
|
|
|
test_cmp expect actual
|
2008-11-10 21:47:11 +00:00
|
|
|
) &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git checkout main
|
2008-11-10 21:47:11 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'fetch with branches containing #' '
|
2013-04-02 07:40:31 +00:00
|
|
|
mk_empty testrepo &&
|
tests: don't depend on template-created .git/branches
As noted in c8a58ac5a52 (Revert "Don't create the $GIT_DIR/branches
directory on init", 2009-10-31) there was an attempt long ago in
0cc5691a8b0 (Don't create the $GIT_DIR/branches directory on init,
2009-10-30) to get rid of the legacy "branches" directory.
We should probably get rid of its creation by removing the
"templates/branches--" file. But whatever our default behavior, our
tests should be tightened up to explicitly create the .git/branches
directory if they rely on our default templates, to make the
dependency on those templates clear.
So let's amend the two tests that would fail if .git/branches wasn't
created. To do this introduce a new "TEST_CREATE_REPO_NO_TEMPLATE"
variable, which we'll set before sourcing test-lib.sh, and change the
"git clone" and "git init" commands in the tests themselves to
explicitly pass "--template=".
This way they won't get a .git/branches in either their top-level
.git, or in the ones they create. We can then amend the tests that
rely on the ".git/branches" directory existing to create it
explicitly, and to remove it after its creation.
This new "TEST_CREATE_REPO_NO_TEMPLATE" variable is a less
heavy-handed version of the "NO_SET_GIT_TEMPLATE_DIR" variable. See
a94d305bf80 (t/t0001-init.sh: add test for 'init with init.templatedir
set', 2010-02-26) for its implementation.
Unlike "TEST_CREATE_REPO_NO_TEMPLATE", this new
"TEST_CREATE_REPO_NO_TEMPLATE" variable is narrowly scoped to what the
"git init" in test-lib.sh does, as opposed to the global effect of
"NO_SET_GIT_TEMPLATE_DIR" and the setting of "GIT_TEMPLATE_DIR" in
wrap-for-bin.sh.
I experimented with adding a new "GIT_WRAP_FOR_BIN_VIA_TEST_LIB"
variable set in test-lib.sh, which would cause wrap-for-bin.sh to not
set GIT_TEMPLATE_DIR, GITPERLLIB etc, as we set those in
test-lib.sh. I think that's a viable approach, but it would interact
e.g. with the appending feature of GITPERLLIB added in
8bade1e12e2 (wrap-for-bin: make bin-wrappers chainable, 2013-07-04).
Doing so would allow us to convert the tests in t0001-init.sh that now
use "NO_SET_GIT_TEMPLATE_DIR" to simply unset "GIT_TEMPLATE_DIR" in a
sub-shell before invoking "git init" or "git clone". I think that
approach is worth pursuing, but let's table it for now. Some future
wrap-for-bin.sh refactoring can try to address it.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-06-03 11:15:04 +00:00
|
|
|
mkdir testrepo/.git/branches &&
|
2008-11-10 21:47:11 +00:00
|
|
|
echo "..#second" > testrepo/.git/branches/branch2 &&
|
2010-04-19 22:08:31 +00:00
|
|
|
(
|
|
|
|
cd testrepo &&
|
2008-11-10 21:47:11 +00:00
|
|
|
git fetch branch2 &&
|
2013-03-18 23:13:41 +00:00
|
|
|
echo "$the_first_commit commit refs/heads/branch2" >expect &&
|
|
|
|
git for-each-ref refs/heads >actual &&
|
|
|
|
test_cmp expect actual
|
2008-11-10 21:47:11 +00:00
|
|
|
) &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git checkout main
|
2008-11-10 21:47:11 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'push with branches' '
|
2013-04-02 07:40:31 +00:00
|
|
|
mk_empty testrepo &&
|
2008-11-10 21:47:11 +00:00
|
|
|
git checkout second &&
|
tests: don't depend on template-created .git/branches
As noted in c8a58ac5a52 (Revert "Don't create the $GIT_DIR/branches
directory on init", 2009-10-31) there was an attempt long ago in
0cc5691a8b0 (Don't create the $GIT_DIR/branches directory on init,
2009-10-30) to get rid of the legacy "branches" directory.
We should probably get rid of its creation by removing the
"templates/branches--" file. But whatever our default behavior, our
tests should be tightened up to explicitly create the .git/branches
directory if they rely on our default templates, to make the
dependency on those templates clear.
So let's amend the two tests that would fail if .git/branches wasn't
created. To do this introduce a new "TEST_CREATE_REPO_NO_TEMPLATE"
variable, which we'll set before sourcing test-lib.sh, and change the
"git clone" and "git init" commands in the tests themselves to
explicitly pass "--template=".
This way they won't get a .git/branches in either their top-level
.git, or in the ones they create. We can then amend the tests that
rely on the ".git/branches" directory existing to create it
explicitly, and to remove it after its creation.
This new "TEST_CREATE_REPO_NO_TEMPLATE" variable is a less
heavy-handed version of the "NO_SET_GIT_TEMPLATE_DIR" variable. See
a94d305bf80 (t/t0001-init.sh: add test for 'init with init.templatedir
set', 2010-02-26) for its implementation.
Unlike "TEST_CREATE_REPO_NO_TEMPLATE", this new
"TEST_CREATE_REPO_NO_TEMPLATE" variable is narrowly scoped to what the
"git init" in test-lib.sh does, as opposed to the global effect of
"NO_SET_GIT_TEMPLATE_DIR" and the setting of "GIT_TEMPLATE_DIR" in
wrap-for-bin.sh.
I experimented with adding a new "GIT_WRAP_FOR_BIN_VIA_TEST_LIB"
variable set in test-lib.sh, which would cause wrap-for-bin.sh to not
set GIT_TEMPLATE_DIR, GITPERLLIB etc, as we set those in
test-lib.sh. I think that's a viable approach, but it would interact
e.g. with the appending feature of GITPERLLIB added in
8bade1e12e2 (wrap-for-bin: make bin-wrappers chainable, 2013-07-04).
Doing so would allow us to convert the tests in t0001-init.sh that now
use "NO_SET_GIT_TEMPLATE_DIR" to simply unset "GIT_TEMPLATE_DIR" in a
sub-shell before invoking "git init" or "git clone". I think that
approach is worth pursuing, but let's table it for now. Some future
wrap-for-bin.sh refactoring can try to address it.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-06-03 11:15:04 +00:00
|
|
|
|
|
|
|
test_when_finished "rm -rf .git/branches" &&
|
|
|
|
mkdir .git/branches &&
|
2008-11-10 21:47:11 +00:00
|
|
|
echo "testrepo" > .git/branches/branch1 &&
|
tests: don't depend on template-created .git/branches
As noted in c8a58ac5a52 (Revert "Don't create the $GIT_DIR/branches
directory on init", 2009-10-31) there was an attempt long ago in
0cc5691a8b0 (Don't create the $GIT_DIR/branches directory on init,
2009-10-30) to get rid of the legacy "branches" directory.
We should probably get rid of its creation by removing the
"templates/branches--" file. But whatever our default behavior, our
tests should be tightened up to explicitly create the .git/branches
directory if they rely on our default templates, to make the
dependency on those templates clear.
So let's amend the two tests that would fail if .git/branches wasn't
created. To do this introduce a new "TEST_CREATE_REPO_NO_TEMPLATE"
variable, which we'll set before sourcing test-lib.sh, and change the
"git clone" and "git init" commands in the tests themselves to
explicitly pass "--template=".
This way they won't get a .git/branches in either their top-level
.git, or in the ones they create. We can then amend the tests that
rely on the ".git/branches" directory existing to create it
explicitly, and to remove it after its creation.
This new "TEST_CREATE_REPO_NO_TEMPLATE" variable is a less
heavy-handed version of the "NO_SET_GIT_TEMPLATE_DIR" variable. See
a94d305bf80 (t/t0001-init.sh: add test for 'init with init.templatedir
set', 2010-02-26) for its implementation.
Unlike "TEST_CREATE_REPO_NO_TEMPLATE", this new
"TEST_CREATE_REPO_NO_TEMPLATE" variable is narrowly scoped to what the
"git init" in test-lib.sh does, as opposed to the global effect of
"NO_SET_GIT_TEMPLATE_DIR" and the setting of "GIT_TEMPLATE_DIR" in
wrap-for-bin.sh.
I experimented with adding a new "GIT_WRAP_FOR_BIN_VIA_TEST_LIB"
variable set in test-lib.sh, which would cause wrap-for-bin.sh to not
set GIT_TEMPLATE_DIR, GITPERLLIB etc, as we set those in
test-lib.sh. I think that's a viable approach, but it would interact
e.g. with the appending feature of GITPERLLIB added in
8bade1e12e2 (wrap-for-bin: make bin-wrappers chainable, 2013-07-04).
Doing so would allow us to convert the tests in t0001-init.sh that now
use "NO_SET_GIT_TEMPLATE_DIR" to simply unset "GIT_TEMPLATE_DIR" in a
sub-shell before invoking "git init" or "git clone". I think that
approach is worth pursuing, but let's table it for now. Some future
wrap-for-bin.sh refactoring can try to address it.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-06-03 11:15:04 +00:00
|
|
|
|
2008-11-10 21:47:11 +00:00
|
|
|
git push branch1 &&
|
2010-04-19 22:08:31 +00:00
|
|
|
(
|
|
|
|
cd testrepo &&
|
2020-11-18 23:44:32 +00:00
|
|
|
echo "$the_first_commit commit refs/heads/main" >expect &&
|
2013-03-18 23:13:41 +00:00
|
|
|
git for-each-ref refs/heads >actual &&
|
|
|
|
test_cmp expect actual
|
2008-11-10 21:47:11 +00:00
|
|
|
)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'push with branches containing #' '
|
2013-04-02 07:40:31 +00:00
|
|
|
mk_empty testrepo &&
|
tests: don't depend on template-created .git/branches
As noted in c8a58ac5a52 (Revert "Don't create the $GIT_DIR/branches
directory on init", 2009-10-31) there was an attempt long ago in
0cc5691a8b0 (Don't create the $GIT_DIR/branches directory on init,
2009-10-30) to get rid of the legacy "branches" directory.
We should probably get rid of its creation by removing the
"templates/branches--" file. But whatever our default behavior, our
tests should be tightened up to explicitly create the .git/branches
directory if they rely on our default templates, to make the
dependency on those templates clear.
So let's amend the two tests that would fail if .git/branches wasn't
created. To do this introduce a new "TEST_CREATE_REPO_NO_TEMPLATE"
variable, which we'll set before sourcing test-lib.sh, and change the
"git clone" and "git init" commands in the tests themselves to
explicitly pass "--template=".
This way they won't get a .git/branches in either their top-level
.git, or in the ones they create. We can then amend the tests that
rely on the ".git/branches" directory existing to create it
explicitly, and to remove it after its creation.
This new "TEST_CREATE_REPO_NO_TEMPLATE" variable is a less
heavy-handed version of the "NO_SET_GIT_TEMPLATE_DIR" variable. See
a94d305bf80 (t/t0001-init.sh: add test for 'init with init.templatedir
set', 2010-02-26) for its implementation.
Unlike "TEST_CREATE_REPO_NO_TEMPLATE", this new
"TEST_CREATE_REPO_NO_TEMPLATE" variable is narrowly scoped to what the
"git init" in test-lib.sh does, as opposed to the global effect of
"NO_SET_GIT_TEMPLATE_DIR" and the setting of "GIT_TEMPLATE_DIR" in
wrap-for-bin.sh.
I experimented with adding a new "GIT_WRAP_FOR_BIN_VIA_TEST_LIB"
variable set in test-lib.sh, which would cause wrap-for-bin.sh to not
set GIT_TEMPLATE_DIR, GITPERLLIB etc, as we set those in
test-lib.sh. I think that's a viable approach, but it would interact
e.g. with the appending feature of GITPERLLIB added in
8bade1e12e2 (wrap-for-bin: make bin-wrappers chainable, 2013-07-04).
Doing so would allow us to convert the tests in t0001-init.sh that now
use "NO_SET_GIT_TEMPLATE_DIR" to simply unset "GIT_TEMPLATE_DIR" in a
sub-shell before invoking "git init" or "git clone". I think that
approach is worth pursuing, but let's table it for now. Some future
wrap-for-bin.sh refactoring can try to address it.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-06-03 11:15:04 +00:00
|
|
|
|
|
|
|
test_when_finished "rm -rf .git/branches" &&
|
|
|
|
mkdir .git/branches &&
|
2008-11-10 21:47:11 +00:00
|
|
|
echo "testrepo#branch3" > .git/branches/branch2 &&
|
tests: don't depend on template-created .git/branches
As noted in c8a58ac5a52 (Revert "Don't create the $GIT_DIR/branches
directory on init", 2009-10-31) there was an attempt long ago in
0cc5691a8b0 (Don't create the $GIT_DIR/branches directory on init,
2009-10-30) to get rid of the legacy "branches" directory.
We should probably get rid of its creation by removing the
"templates/branches--" file. But whatever our default behavior, our
tests should be tightened up to explicitly create the .git/branches
directory if they rely on our default templates, to make the
dependency on those templates clear.
So let's amend the two tests that would fail if .git/branches wasn't
created. To do this introduce a new "TEST_CREATE_REPO_NO_TEMPLATE"
variable, which we'll set before sourcing test-lib.sh, and change the
"git clone" and "git init" commands in the tests themselves to
explicitly pass "--template=".
This way they won't get a .git/branches in either their top-level
.git, or in the ones they create. We can then amend the tests that
rely on the ".git/branches" directory existing to create it
explicitly, and to remove it after its creation.
This new "TEST_CREATE_REPO_NO_TEMPLATE" variable is a less
heavy-handed version of the "NO_SET_GIT_TEMPLATE_DIR" variable. See
a94d305bf80 (t/t0001-init.sh: add test for 'init with init.templatedir
set', 2010-02-26) for its implementation.
Unlike "TEST_CREATE_REPO_NO_TEMPLATE", this new
"TEST_CREATE_REPO_NO_TEMPLATE" variable is narrowly scoped to what the
"git init" in test-lib.sh does, as opposed to the global effect of
"NO_SET_GIT_TEMPLATE_DIR" and the setting of "GIT_TEMPLATE_DIR" in
wrap-for-bin.sh.
I experimented with adding a new "GIT_WRAP_FOR_BIN_VIA_TEST_LIB"
variable set in test-lib.sh, which would cause wrap-for-bin.sh to not
set GIT_TEMPLATE_DIR, GITPERLLIB etc, as we set those in
test-lib.sh. I think that's a viable approach, but it would interact
e.g. with the appending feature of GITPERLLIB added in
8bade1e12e2 (wrap-for-bin: make bin-wrappers chainable, 2013-07-04).
Doing so would allow us to convert the tests in t0001-init.sh that now
use "NO_SET_GIT_TEMPLATE_DIR" to simply unset "GIT_TEMPLATE_DIR" in a
sub-shell before invoking "git init" or "git clone". I think that
approach is worth pursuing, but let's table it for now. Some future
wrap-for-bin.sh refactoring can try to address it.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-06-03 11:15:04 +00:00
|
|
|
|
2008-11-10 21:47:11 +00:00
|
|
|
git push branch2 &&
|
2010-04-19 22:08:31 +00:00
|
|
|
(
|
|
|
|
cd testrepo &&
|
2013-03-18 23:13:41 +00:00
|
|
|
echo "$the_first_commit commit refs/heads/branch3" >expect &&
|
|
|
|
git for-each-ref refs/heads >actual &&
|
|
|
|
test_cmp expect actual
|
2008-11-10 21:47:11 +00:00
|
|
|
) &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git checkout main
|
2008-11-10 21:47:11 +00:00
|
|
|
'
|
|
|
|
|
2010-04-19 22:19:18 +00:00
|
|
|
test_expect_success 'push into aliased refs (consistent)' '
|
2020-11-18 23:44:32 +00:00
|
|
|
mk_test testrepo heads/main &&
|
2013-04-02 07:40:31 +00:00
|
|
|
mk_child testrepo child1 &&
|
|
|
|
mk_child testrepo child2 &&
|
2010-04-19 22:19:18 +00:00
|
|
|
(
|
|
|
|
cd child1 &&
|
|
|
|
git branch foo &&
|
2018-07-02 00:24:01 +00:00
|
|
|
git symbolic-ref refs/heads/bar refs/heads/foo &&
|
2010-04-19 22:19:18 +00:00
|
|
|
git config receive.denyCurrentBranch false
|
|
|
|
) &&
|
|
|
|
(
|
|
|
|
cd child2 &&
|
|
|
|
>path2 &&
|
|
|
|
git add path2 &&
|
|
|
|
test_tick &&
|
|
|
|
git commit -a -m child2 &&
|
|
|
|
git branch foo &&
|
|
|
|
git branch bar &&
|
|
|
|
git push ../child1 foo bar
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'push into aliased refs (inconsistent)' '
|
2020-11-18 23:44:32 +00:00
|
|
|
mk_test testrepo heads/main &&
|
2013-04-02 07:40:31 +00:00
|
|
|
mk_child testrepo child1 &&
|
|
|
|
mk_child testrepo child2 &&
|
2010-04-19 22:19:18 +00:00
|
|
|
(
|
|
|
|
cd child1 &&
|
|
|
|
git branch foo &&
|
2018-07-02 00:24:01 +00:00
|
|
|
git symbolic-ref refs/heads/bar refs/heads/foo &&
|
2010-04-19 22:19:18 +00:00
|
|
|
git config receive.denyCurrentBranch false
|
|
|
|
) &&
|
|
|
|
(
|
|
|
|
cd child2 &&
|
|
|
|
>path2 &&
|
|
|
|
git add path2 &&
|
|
|
|
test_tick &&
|
|
|
|
git commit -a -m child2 &&
|
|
|
|
git branch foo &&
|
|
|
|
>path3 &&
|
|
|
|
git add path3 &&
|
|
|
|
test_tick &&
|
|
|
|
git commit -a -m child2 &&
|
|
|
|
git branch bar &&
|
|
|
|
test_must_fail git push ../child1 foo bar 2>stderr &&
|
|
|
|
grep "refusing inconsistent update" stderr
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2018-07-31 13:07:13 +00:00
|
|
|
test_force_push_tag () {
|
|
|
|
tag_type_description=$1
|
|
|
|
tag_args=$2
|
|
|
|
|
2018-08-31 20:09:57 +00:00
|
|
|
test_expect_success "force pushing required to update $tag_type_description" "
|
2020-11-18 23:44:32 +00:00
|
|
|
mk_test testrepo heads/main &&
|
2018-07-31 13:07:13 +00:00
|
|
|
mk_child testrepo child1 &&
|
|
|
|
mk_child testrepo child2 &&
|
|
|
|
(
|
|
|
|
cd child1 &&
|
|
|
|
git tag testTag &&
|
|
|
|
git push ../child2 testTag &&
|
|
|
|
>file1 &&
|
|
|
|
git add file1 &&
|
|
|
|
git commit -m 'file1' &&
|
|
|
|
git tag $tag_args testTag &&
|
|
|
|
test_must_fail git push ../child2 testTag &&
|
|
|
|
git push --force ../child2 testTag &&
|
|
|
|
git tag $tag_args testTag HEAD~ &&
|
|
|
|
test_must_fail git push ../child2 testTag &&
|
|
|
|
git push --force ../child2 testTag &&
|
|
|
|
|
|
|
|
# Clobbering without + in refspec needs --force
|
|
|
|
git tag -f testTag &&
|
|
|
|
test_must_fail git push ../child2 'refs/tags/*:refs/tags/*' &&
|
|
|
|
git push --force ../child2 'refs/tags/*:refs/tags/*' &&
|
|
|
|
|
|
|
|
# Clobbering with + in refspec does not need --force
|
|
|
|
git tag -f testTag HEAD~ &&
|
|
|
|
git push ../child2 '+refs/tags/*:refs/tags/*' &&
|
|
|
|
|
|
|
|
# Clobbering with --no-force still obeys + in refspec
|
|
|
|
git tag -f testTag &&
|
|
|
|
git push --no-force ../child2 '+refs/tags/*:refs/tags/*' &&
|
|
|
|
|
|
|
|
# Clobbering with/without --force and 'tag <name>' format
|
|
|
|
git tag -f testTag HEAD~ &&
|
|
|
|
test_must_fail git push ../child2 tag testTag &&
|
|
|
|
git push --force ../child2 tag testTag
|
|
|
|
)
|
|
|
|
"
|
|
|
|
}
|
|
|
|
|
|
|
|
test_force_push_tag "lightweight tag" "-f"
|
2018-08-31 20:09:58 +00:00
|
|
|
test_force_push_tag "annotated tag" "-f -a -m'tag message'"
|
2012-11-30 01:41:37 +00:00
|
|
|
|
2018-08-31 20:09:59 +00:00
|
|
|
test_force_fetch_tag () {
|
|
|
|
tag_type_description=$1
|
|
|
|
tag_args=$2
|
|
|
|
|
fetch: stop clobbering existing tags without --force
Change "fetch" to treat "+" in refspecs (aka --force) to mean we
should clobber a local tag of the same name.
This changes the long-standing behavior of "fetch" added in
853a3697dc ("[PATCH] Multi-head fetch.", 2005-08-20). Before this
change, all tag fetches effectively had --force enabled. See the
git-fetch-script code in fast_forward_local() with the comment:
> Tags need not be pointing at commits so there is no way to
> guarantee "fast-forward" anyway.
That commit and the rest of the history of "fetch" shows that the
"+" (--force) part of refpecs was only conceived for branch updates,
while tags have accepted any changes from upstream unconditionally and
clobbered the local tag object. Changing this behavior has been
discussed as early as 2011[1].
The current behavior doesn't make sense to me, it easily results in
local tags accidentally being clobbered. We could namespace our tags
per-remote and not locally populate refs/tags/*, but as with my
97716d217c ("fetch: add a --prune-tags option and fetch.pruneTags
config", 2018-02-09) it's easier to work around the current
implementation than to fix the root cause.
So this change implements suggestion #1 from Jeff's 2011 E-Mail[1],
"fetch" now only clobbers the tag if either "+" is provided as part of
the refspec, or if "--force" is provided on the command-line.
This also makes it nicely symmetrical with how "tag" itself works when
creating tags. I.e. we refuse to clobber any existing tags unless
"--force" is supplied. Now we can refuse all such clobbering, whether
it would happen by clobbering a local tag with "tag", or by fetching
it from the remote with "fetch".
Ref updates outside refs/{tags,heads/* are still still not symmetrical
with how "git push" works, as discussed in the recently changed
pull-fetch-param.txt documentation. This change brings the two
divergent behaviors more into line with one another. I don't think
there's any reason "fetch" couldn't fully converge with the behavior
used by "push", but that's a topic for another change.
One of the tests added in 31b808a032 ("clone --single: limit the fetch
refspec to fetched branch", 2012-09-20) is being changed to use
--force where a clone would clobber a tag. This changes nothing about
the existing behavior of the test.
1. https://public-inbox.org/git/20111123221658.GA22313@sigill.intra.peff.net/
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-31 20:10:04 +00:00
|
|
|
test_expect_success "fetch will not clobber an existing $tag_type_description without --force" "
|
2020-11-18 23:44:32 +00:00
|
|
|
mk_test testrepo heads/main &&
|
2018-08-31 20:09:59 +00:00
|
|
|
mk_child testrepo child1 &&
|
|
|
|
mk_child testrepo child2 &&
|
|
|
|
(
|
|
|
|
cd testrepo &&
|
|
|
|
git tag testTag &&
|
|
|
|
git -C ../child1 fetch origin tag testTag &&
|
|
|
|
>file1 &&
|
|
|
|
git add file1 &&
|
|
|
|
git commit -m 'file1' &&
|
|
|
|
git tag $tag_args testTag &&
|
fetch: stop clobbering existing tags without --force
Change "fetch" to treat "+" in refspecs (aka --force) to mean we
should clobber a local tag of the same name.
This changes the long-standing behavior of "fetch" added in
853a3697dc ("[PATCH] Multi-head fetch.", 2005-08-20). Before this
change, all tag fetches effectively had --force enabled. See the
git-fetch-script code in fast_forward_local() with the comment:
> Tags need not be pointing at commits so there is no way to
> guarantee "fast-forward" anyway.
That commit and the rest of the history of "fetch" shows that the
"+" (--force) part of refpecs was only conceived for branch updates,
while tags have accepted any changes from upstream unconditionally and
clobbered the local tag object. Changing this behavior has been
discussed as early as 2011[1].
The current behavior doesn't make sense to me, it easily results in
local tags accidentally being clobbered. We could namespace our tags
per-remote and not locally populate refs/tags/*, but as with my
97716d217c ("fetch: add a --prune-tags option and fetch.pruneTags
config", 2018-02-09) it's easier to work around the current
implementation than to fix the root cause.
So this change implements suggestion #1 from Jeff's 2011 E-Mail[1],
"fetch" now only clobbers the tag if either "+" is provided as part of
the refspec, or if "--force" is provided on the command-line.
This also makes it nicely symmetrical with how "tag" itself works when
creating tags. I.e. we refuse to clobber any existing tags unless
"--force" is supplied. Now we can refuse all such clobbering, whether
it would happen by clobbering a local tag with "tag", or by fetching
it from the remote with "fetch".
Ref updates outside refs/{tags,heads/* are still still not symmetrical
with how "git push" works, as discussed in the recently changed
pull-fetch-param.txt documentation. This change brings the two
divergent behaviors more into line with one another. I don't think
there's any reason "fetch" couldn't fully converge with the behavior
used by "push", but that's a topic for another change.
One of the tests added in 31b808a032 ("clone --single: limit the fetch
refspec to fetched branch", 2012-09-20) is being changed to use
--force where a clone would clobber a tag. This changes nothing about
the existing behavior of the test.
1. https://public-inbox.org/git/20111123221658.GA22313@sigill.intra.peff.net/
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-31 20:10:04 +00:00
|
|
|
test_must_fail git -C ../child1 fetch origin tag testTag &&
|
|
|
|
git -C ../child1 fetch origin '+refs/tags/*:refs/tags/*'
|
2018-08-31 20:09:59 +00:00
|
|
|
)
|
|
|
|
"
|
|
|
|
}
|
|
|
|
|
|
|
|
test_force_fetch_tag "lightweight tag" "-f"
|
|
|
|
test_force_fetch_tag "annotated tag" "-f -a -m'tag message'"
|
2012-11-30 01:41:37 +00:00
|
|
|
|
2010-02-27 04:52:16 +00:00
|
|
|
test_expect_success 'push --porcelain' '
|
2013-04-02 07:40:31 +00:00
|
|
|
mk_empty testrepo &&
|
2010-02-27 04:52:16 +00:00
|
|
|
echo >.git/foo "To testrepo" &&
|
2020-11-18 23:44:32 +00:00
|
|
|
echo >>.git/foo "* refs/heads/main:refs/remotes/origin/main [new reference]" &&
|
2010-02-27 04:52:16 +00:00
|
|
|
echo >>.git/foo "Done" &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git push >.git/bar --porcelain testrepo refs/heads/main:refs/remotes/origin/main &&
|
2010-02-27 04:52:16 +00:00
|
|
|
(
|
|
|
|
cd testrepo &&
|
2020-11-18 23:44:32 +00:00
|
|
|
echo "$the_commit commit refs/remotes/origin/main" >expect &&
|
2013-03-18 23:13:41 +00:00
|
|
|
git for-each-ref refs/remotes/origin >actual &&
|
|
|
|
test_cmp expect actual
|
2010-02-27 04:52:16 +00:00
|
|
|
) &&
|
2010-03-12 05:51:57 +00:00
|
|
|
test_cmp .git/foo .git/bar
|
2010-02-27 04:52:16 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'push --porcelain bad url' '
|
2013-04-02 07:40:31 +00:00
|
|
|
mk_empty testrepo &&
|
2020-11-18 23:44:32 +00:00
|
|
|
test_must_fail git push >.git/bar --porcelain asdfasdfasd refs/heads/main:refs/remotes/origin/main &&
|
2017-01-03 19:57:07 +00:00
|
|
|
! grep -q Done .git/bar
|
2010-02-27 04:52:16 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'push --porcelain rejected' '
|
2013-04-02 07:40:31 +00:00
|
|
|
mk_empty testrepo &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git push testrepo refs/heads/main:refs/remotes/origin/main &&
|
2010-02-27 04:52:16 +00:00
|
|
|
(cd testrepo &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git reset --hard origin/main^ &&
|
2010-02-27 04:52:16 +00:00
|
|
|
git config receive.denyCurrentBranch true) &&
|
|
|
|
|
|
|
|
echo >.git/foo "To testrepo" &&
|
2020-11-18 23:44:32 +00:00
|
|
|
echo >>.git/foo "! refs/heads/main:refs/heads/main [remote rejected] (branch is currently checked out)" &&
|
2020-04-17 09:45:32 +00:00
|
|
|
echo >>.git/foo "Done" &&
|
2010-02-27 04:52:16 +00:00
|
|
|
|
2020-11-18 23:44:32 +00:00
|
|
|
test_must_fail git push >.git/bar --porcelain testrepo refs/heads/main:refs/heads/main &&
|
2010-03-12 05:51:57 +00:00
|
|
|
test_cmp .git/foo .git/bar
|
2010-02-27 04:52:16 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'push --porcelain --dry-run rejected' '
|
2013-04-02 07:40:31 +00:00
|
|
|
mk_empty testrepo &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git push testrepo refs/heads/main:refs/remotes/origin/main &&
|
2010-02-27 04:52:16 +00:00
|
|
|
(cd testrepo &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git reset --hard origin/main &&
|
2010-02-27 04:52:16 +00:00
|
|
|
git config receive.denyCurrentBranch true) &&
|
|
|
|
|
|
|
|
echo >.git/foo "To testrepo" &&
|
2020-11-18 23:44:32 +00:00
|
|
|
echo >>.git/foo "! refs/heads/main^:refs/heads/main [rejected] (non-fast-forward)" &&
|
2010-02-27 04:52:16 +00:00
|
|
|
echo >>.git/foo "Done" &&
|
|
|
|
|
2020-11-18 23:44:32 +00:00
|
|
|
test_must_fail git push >.git/bar --porcelain --dry-run testrepo refs/heads/main^:refs/heads/main &&
|
2010-03-12 05:51:57 +00:00
|
|
|
test_cmp .git/foo .git/bar
|
2010-02-27 04:52:16 +00:00
|
|
|
'
|
|
|
|
|
2012-02-22 22:43:41 +00:00
|
|
|
test_expect_success 'push --prune' '
|
2020-11-18 23:44:32 +00:00
|
|
|
mk_test testrepo heads/main heads/second heads/foo heads/bar &&
|
2013-01-05 00:08:26 +00:00
|
|
|
git push --prune testrepo : &&
|
2020-11-18 23:44:32 +00:00
|
|
|
check_push_result testrepo $the_commit heads/main &&
|
2013-04-02 07:40:31 +00:00
|
|
|
check_push_result testrepo $the_first_commit heads/second &&
|
|
|
|
! check_push_result testrepo $the_first_commit heads/foo heads/bar
|
2012-02-22 22:43:41 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'push --prune refspec' '
|
2020-11-18 23:44:32 +00:00
|
|
|
mk_test testrepo tmp/main tmp/second tmp/foo tmp/bar &&
|
2012-02-22 22:43:41 +00:00
|
|
|
git push --prune testrepo "refs/heads/*:refs/tmp/*" &&
|
2020-11-18 23:44:32 +00:00
|
|
|
check_push_result testrepo $the_commit tmp/main &&
|
2013-04-02 07:40:31 +00:00
|
|
|
check_push_result testrepo $the_first_commit tmp/second &&
|
|
|
|
! check_push_result testrepo $the_first_commit tmp/foo tmp/bar
|
2012-02-22 22:43:41 +00:00
|
|
|
'
|
|
|
|
|
upload/receive-pack: allow hiding ref hierarchies
A repository may have refs that are only used for its internal
bookkeeping purposes that should not be exposed to the others that
come over the network.
Teach upload-pack to omit some refs from its initial advertisement
by paying attention to the uploadpack.hiderefs multi-valued
configuration variable. Do the same to receive-pack via the
receive.hiderefs variable. As a convenient short-hand, allow using
transfer.hiderefs to set the value to both of these variables.
Any ref that is under the hierarchies listed on the value of these
variable is excluded from responses to requests made by "ls-remote",
"fetch", etc. (for upload-pack) and "push" (for receive-pack).
Because these hidden refs do not count as OUR_REF, an attempt to
fetch objects at the tip of them will be rejected, and because these
refs do not get advertised, "git push :" will not see local branches
that have the same name as them as "matching" ones to be sent.
An attempt to update/delete these hidden refs with an explicit
refspec, e.g. "git push origin :refs/hidden/22", is rejected. This
is not a new restriction. To the pusher, it would appear that there
is no such ref, so its push request will conclude with "Now that I
sent you all the data, it is time for you to update the refs. I saw
that the ref did not exist when I started pushing, and I want the
result to point at this commit". The receiving end will apply the
compare-and-swap rule to this request and rejects the push with
"Well, your update request conflicts with somebody else; I see there
is such a ref.", which is the right thing to do. Otherwise a push to
a hidden ref will always be "the last one wins", which is not a good
default.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-01-19 00:08:30 +00:00
|
|
|
for configsection in transfer receive
|
|
|
|
do
|
|
|
|
test_expect_success "push to update a ref hidden by $configsection.hiderefs" '
|
2020-11-18 23:44:32 +00:00
|
|
|
mk_test testrepo heads/main hidden/one hidden/two hidden/three &&
|
upload/receive-pack: allow hiding ref hierarchies
A repository may have refs that are only used for its internal
bookkeeping purposes that should not be exposed to the others that
come over the network.
Teach upload-pack to omit some refs from its initial advertisement
by paying attention to the uploadpack.hiderefs multi-valued
configuration variable. Do the same to receive-pack via the
receive.hiderefs variable. As a convenient short-hand, allow using
transfer.hiderefs to set the value to both of these variables.
Any ref that is under the hierarchies listed on the value of these
variable is excluded from responses to requests made by "ls-remote",
"fetch", etc. (for upload-pack) and "push" (for receive-pack).
Because these hidden refs do not count as OUR_REF, an attempt to
fetch objects at the tip of them will be rejected, and because these
refs do not get advertised, "git push :" will not see local branches
that have the same name as them as "matching" ones to be sent.
An attempt to update/delete these hidden refs with an explicit
refspec, e.g. "git push origin :refs/hidden/22", is rejected. This
is not a new restriction. To the pusher, it would appear that there
is no such ref, so its push request will conclude with "Now that I
sent you all the data, it is time for you to update the refs. I saw
that the ref did not exist when I started pushing, and I want the
result to point at this commit". The receiving end will apply the
compare-and-swap rule to this request and rejects the push with
"Well, your update request conflicts with somebody else; I see there
is such a ref.", which is the right thing to do. Otherwise a push to
a hidden ref will always be "the last one wins", which is not a good
default.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-01-19 00:08:30 +00:00
|
|
|
(
|
|
|
|
cd testrepo &&
|
|
|
|
git config $configsection.hiderefs refs/hidden
|
|
|
|
) &&
|
|
|
|
|
|
|
|
# push to unhidden ref succeeds normally
|
2020-11-18 23:44:32 +00:00
|
|
|
git push testrepo main:refs/heads/main &&
|
|
|
|
check_push_result testrepo $the_commit heads/main &&
|
upload/receive-pack: allow hiding ref hierarchies
A repository may have refs that are only used for its internal
bookkeeping purposes that should not be exposed to the others that
come over the network.
Teach upload-pack to omit some refs from its initial advertisement
by paying attention to the uploadpack.hiderefs multi-valued
configuration variable. Do the same to receive-pack via the
receive.hiderefs variable. As a convenient short-hand, allow using
transfer.hiderefs to set the value to both of these variables.
Any ref that is under the hierarchies listed on the value of these
variable is excluded from responses to requests made by "ls-remote",
"fetch", etc. (for upload-pack) and "push" (for receive-pack).
Because these hidden refs do not count as OUR_REF, an attempt to
fetch objects at the tip of them will be rejected, and because these
refs do not get advertised, "git push :" will not see local branches
that have the same name as them as "matching" ones to be sent.
An attempt to update/delete these hidden refs with an explicit
refspec, e.g. "git push origin :refs/hidden/22", is rejected. This
is not a new restriction. To the pusher, it would appear that there
is no such ref, so its push request will conclude with "Now that I
sent you all the data, it is time for you to update the refs. I saw
that the ref did not exist when I started pushing, and I want the
result to point at this commit". The receiving end will apply the
compare-and-swap rule to this request and rejects the push with
"Well, your update request conflicts with somebody else; I see there
is such a ref.", which is the right thing to do. Otherwise a push to
a hidden ref will always be "the last one wins", which is not a good
default.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-01-19 00:08:30 +00:00
|
|
|
|
|
|
|
# push to update a hidden ref should fail
|
2020-11-18 23:44:32 +00:00
|
|
|
test_must_fail git push testrepo main:refs/hidden/one &&
|
2013-04-02 07:40:31 +00:00
|
|
|
check_push_result testrepo $the_first_commit hidden/one &&
|
upload/receive-pack: allow hiding ref hierarchies
A repository may have refs that are only used for its internal
bookkeeping purposes that should not be exposed to the others that
come over the network.
Teach upload-pack to omit some refs from its initial advertisement
by paying attention to the uploadpack.hiderefs multi-valued
configuration variable. Do the same to receive-pack via the
receive.hiderefs variable. As a convenient short-hand, allow using
transfer.hiderefs to set the value to both of these variables.
Any ref that is under the hierarchies listed on the value of these
variable is excluded from responses to requests made by "ls-remote",
"fetch", etc. (for upload-pack) and "push" (for receive-pack).
Because these hidden refs do not count as OUR_REF, an attempt to
fetch objects at the tip of them will be rejected, and because these
refs do not get advertised, "git push :" will not see local branches
that have the same name as them as "matching" ones to be sent.
An attempt to update/delete these hidden refs with an explicit
refspec, e.g. "git push origin :refs/hidden/22", is rejected. This
is not a new restriction. To the pusher, it would appear that there
is no such ref, so its push request will conclude with "Now that I
sent you all the data, it is time for you to update the refs. I saw
that the ref did not exist when I started pushing, and I want the
result to point at this commit". The receiving end will apply the
compare-and-swap rule to this request and rejects the push with
"Well, your update request conflicts with somebody else; I see there
is such a ref.", which is the right thing to do. Otherwise a push to
a hidden ref will always be "the last one wins", which is not a good
default.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-01-19 00:08:30 +00:00
|
|
|
|
|
|
|
# push to delete a hidden ref should fail
|
|
|
|
test_must_fail git push testrepo :refs/hidden/two &&
|
2013-04-02 07:40:31 +00:00
|
|
|
check_push_result testrepo $the_first_commit hidden/two &&
|
upload/receive-pack: allow hiding ref hierarchies
A repository may have refs that are only used for its internal
bookkeeping purposes that should not be exposed to the others that
come over the network.
Teach upload-pack to omit some refs from its initial advertisement
by paying attention to the uploadpack.hiderefs multi-valued
configuration variable. Do the same to receive-pack via the
receive.hiderefs variable. As a convenient short-hand, allow using
transfer.hiderefs to set the value to both of these variables.
Any ref that is under the hierarchies listed on the value of these
variable is excluded from responses to requests made by "ls-remote",
"fetch", etc. (for upload-pack) and "push" (for receive-pack).
Because these hidden refs do not count as OUR_REF, an attempt to
fetch objects at the tip of them will be rejected, and because these
refs do not get advertised, "git push :" will not see local branches
that have the same name as them as "matching" ones to be sent.
An attempt to update/delete these hidden refs with an explicit
refspec, e.g. "git push origin :refs/hidden/22", is rejected. This
is not a new restriction. To the pusher, it would appear that there
is no such ref, so its push request will conclude with "Now that I
sent you all the data, it is time for you to update the refs. I saw
that the ref did not exist when I started pushing, and I want the
result to point at this commit". The receiving end will apply the
compare-and-swap rule to this request and rejects the push with
"Well, your update request conflicts with somebody else; I see there
is such a ref.", which is the right thing to do. Otherwise a push to
a hidden ref will always be "the last one wins", which is not a good
default.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-01-19 00:08:30 +00:00
|
|
|
|
|
|
|
# idempotent push to update a hidden ref should fail
|
|
|
|
test_must_fail git push testrepo $the_first_commit:refs/hidden/three &&
|
2013-04-02 07:40:31 +00:00
|
|
|
check_push_result testrepo $the_first_commit hidden/three
|
upload/receive-pack: allow hiding ref hierarchies
A repository may have refs that are only used for its internal
bookkeeping purposes that should not be exposed to the others that
come over the network.
Teach upload-pack to omit some refs from its initial advertisement
by paying attention to the uploadpack.hiderefs multi-valued
configuration variable. Do the same to receive-pack via the
receive.hiderefs variable. As a convenient short-hand, allow using
transfer.hiderefs to set the value to both of these variables.
Any ref that is under the hierarchies listed on the value of these
variable is excluded from responses to requests made by "ls-remote",
"fetch", etc. (for upload-pack) and "push" (for receive-pack).
Because these hidden refs do not count as OUR_REF, an attempt to
fetch objects at the tip of them will be rejected, and because these
refs do not get advertised, "git push :" will not see local branches
that have the same name as them as "matching" ones to be sent.
An attempt to update/delete these hidden refs with an explicit
refspec, e.g. "git push origin :refs/hidden/22", is rejected. This
is not a new restriction. To the pusher, it would appear that there
is no such ref, so its push request will conclude with "Now that I
sent you all the data, it is time for you to update the refs. I saw
that the ref did not exist when I started pushing, and I want the
result to point at this commit". The receiving end will apply the
compare-and-swap rule to this request and rejects the push with
"Well, your update request conflicts with somebody else; I see there
is such a ref.", which is the right thing to do. Otherwise a push to
a hidden ref will always be "the last one wins", which is not a good
default.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-01-19 00:08:30 +00:00
|
|
|
'
|
|
|
|
done
|
|
|
|
|
2013-01-29 22:02:15 +00:00
|
|
|
test_expect_success 'fetch exact SHA1' '
|
2020-11-18 23:44:32 +00:00
|
|
|
mk_test testrepo heads/main hidden/one &&
|
|
|
|
git push testrepo main:refs/hidden/one &&
|
2013-01-29 22:02:15 +00:00
|
|
|
(
|
|
|
|
cd testrepo &&
|
|
|
|
git config transfer.hiderefs refs/hidden
|
|
|
|
) &&
|
2013-04-02 07:40:31 +00:00
|
|
|
check_push_result testrepo $the_commit hidden/one &&
|
2013-01-29 22:02:15 +00:00
|
|
|
|
2013-04-02 07:40:31 +00:00
|
|
|
mk_child testrepo child &&
|
2013-01-29 22:02:15 +00:00
|
|
|
(
|
|
|
|
cd child &&
|
|
|
|
|
|
|
|
# make sure $the_commit does not exist here
|
|
|
|
git repack -a -d &&
|
|
|
|
git prune &&
|
|
|
|
test_must_fail git cat-file -t $the_commit &&
|
|
|
|
|
2019-02-25 21:54:08 +00:00
|
|
|
# Some protocol versions (e.g. 2) support fetching
|
|
|
|
# unadvertised objects, so restrict this test to v0.
|
|
|
|
|
2013-01-29 22:02:15 +00:00
|
|
|
# fetching the hidden object should fail by default
|
2019-12-24 01:01:10 +00:00
|
|
|
test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
|
2019-02-25 21:54:08 +00:00
|
|
|
git fetch -v ../testrepo $the_commit:refs/heads/copy 2>err &&
|
2017-02-22 16:05:57 +00:00
|
|
|
test_i18ngrep "Server does not allow request for unadvertised object" err &&
|
2013-01-29 22:02:15 +00:00
|
|
|
test_must_fail git rev-parse --verify refs/heads/copy &&
|
|
|
|
|
|
|
|
# the server side can allow it to succeed
|
|
|
|
(
|
|
|
|
cd ../testrepo &&
|
|
|
|
git config uploadpack.allowtipsha1inwant true
|
|
|
|
) &&
|
|
|
|
|
2020-11-18 23:44:32 +00:00
|
|
|
git fetch -v ../testrepo $the_commit:refs/heads/copy main:refs/heads/extra &&
|
filter_ref: make a copy of extra "sought" entries
If the server supports allow_tip_sha1_in_want, we add any
unmatched raw-sha1 entries in our "sought" list of refs to
the list of refs we will ask the other side for. We do so by
inserting the original "struct ref" directly into our list,
rather than making a copy. This has several problems.
The most minor problem is that one cannot ever free the
resulting list; it contains structs that are copies of the
remote refs (made earlier by fetch_pack) along with sought
refs that are referenced elsewhere.
But more importantly that we set the ref->next pointer to
NULL, chopping off the remainder of any existing list that
the ref was a part of. We get the set of "sought" refs in
an array rather than a linked list, but that array is often
in turn generated from a list. The test modification in
t5516 demonstrates this. Rather than fetching just an exact
sha1, we fetch that sha1 plus another ref:
- we build a linked list of refs to fetch when do_fetch
calls get_ref_map; the exact sha1 is first, followed by
the named ref ("refs/heads/extra" in this case).
- we pass that linked list to transport_fetch_ref, which
squashes it into an array of pointers
- that array goes to fetch_pack, which calls filter_ref.
There we generate the want list from a mix of what the
remote side has advertised, and the "sought" entry for
the exact sha1. We set the sought entry's "next" pointer
to NULL.
- after we return from transport_fetch_refs, we then try
to update the refs by following the linked list. But our
list is now truncated, and we do not update
refs/heads/extra at all.
We can fix this by making a copy of the ref. There's nothing
that fetch_pack does to it that must be reflected in the
original "sought" list (and indeed, if that were the case we
would have a serious bug, because it is only exact-sha1
entries which are treated this way).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-03-19 20:37:09 +00:00
|
|
|
cat >expect <<-EOF &&
|
|
|
|
$the_commit
|
|
|
|
$the_first_commit
|
|
|
|
EOF
|
|
|
|
{
|
|
|
|
git rev-parse --verify refs/heads/copy &&
|
|
|
|
git rev-parse --verify refs/heads/extra
|
|
|
|
} >actual &&
|
|
|
|
test_cmp expect actual
|
2013-01-29 22:02:15 +00:00
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2018-05-31 07:23:39 +00:00
|
|
|
test_expect_success 'fetch exact SHA1 in protocol v2' '
|
2020-11-18 23:44:32 +00:00
|
|
|
mk_test testrepo heads/main hidden/one &&
|
|
|
|
git push testrepo main:refs/hidden/one &&
|
2018-05-31 07:23:39 +00:00
|
|
|
git -C testrepo config transfer.hiderefs refs/hidden &&
|
|
|
|
check_push_result testrepo $the_commit hidden/one &&
|
|
|
|
|
|
|
|
mk_child testrepo child &&
|
|
|
|
git -C child config protocol.version 2 &&
|
|
|
|
|
|
|
|
# make sure $the_commit does not exist here
|
|
|
|
git -C child repack -a -d &&
|
|
|
|
git -C child prune &&
|
|
|
|
test_must_fail git -C child cat-file -t $the_commit &&
|
|
|
|
|
|
|
|
# fetching the hidden object succeeds by default
|
|
|
|
# NEEDSWORK: should this match the v0 behavior instead?
|
|
|
|
git -C child fetch -v ../testrepo $the_commit:refs/heads/copy
|
|
|
|
'
|
|
|
|
|
2015-05-21 20:23:39 +00:00
|
|
|
for configallowtipsha1inwant in true false
|
|
|
|
do
|
|
|
|
test_expect_success "shallow fetch reachable SHA1 (but not a ref), allowtipsha1inwant=$configallowtipsha1inwant" '
|
|
|
|
mk_empty testrepo &&
|
|
|
|
(
|
|
|
|
cd testrepo &&
|
|
|
|
git config uploadpack.allowtipsha1inwant $configallowtipsha1inwant &&
|
|
|
|
git commit --allow-empty -m foo &&
|
|
|
|
git commit --allow-empty -m bar
|
|
|
|
) &&
|
|
|
|
SHA1=$(git --git-dir=testrepo/.git rev-parse HEAD^) &&
|
|
|
|
mk_empty shallow &&
|
|
|
|
(
|
|
|
|
cd shallow &&
|
2019-02-25 21:54:08 +00:00
|
|
|
# Some protocol versions (e.g. 2) support fetching
|
|
|
|
# unadvertised objects, so restrict this test to v0.
|
2019-12-24 01:01:10 +00:00
|
|
|
test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
|
2019-02-25 21:54:08 +00:00
|
|
|
git fetch --depth=1 ../testrepo/.git $SHA1 &&
|
2015-05-21 20:23:39 +00:00
|
|
|
git --git-dir=../testrepo/.git config uploadpack.allowreachablesha1inwant true &&
|
|
|
|
git fetch --depth=1 ../testrepo/.git $SHA1 &&
|
|
|
|
git cat-file commit $SHA1
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success "deny fetch unreachable SHA1, allowtipsha1inwant=$configallowtipsha1inwant" '
|
|
|
|
mk_empty testrepo &&
|
|
|
|
(
|
|
|
|
cd testrepo &&
|
|
|
|
git config uploadpack.allowtipsha1inwant $configallowtipsha1inwant &&
|
|
|
|
git commit --allow-empty -m foo &&
|
|
|
|
git commit --allow-empty -m bar &&
|
|
|
|
git commit --allow-empty -m xyz
|
|
|
|
) &&
|
|
|
|
SHA1_1=$(git --git-dir=testrepo/.git rev-parse HEAD^^) &&
|
|
|
|
SHA1_2=$(git --git-dir=testrepo/.git rev-parse HEAD^) &&
|
|
|
|
SHA1_3=$(git --git-dir=testrepo/.git rev-parse HEAD) &&
|
|
|
|
(
|
|
|
|
cd testrepo &&
|
|
|
|
git reset --hard $SHA1_2 &&
|
|
|
|
git cat-file commit $SHA1_1 &&
|
|
|
|
git cat-file commit $SHA1_3
|
|
|
|
) &&
|
|
|
|
mk_empty shallow &&
|
|
|
|
(
|
|
|
|
cd shallow &&
|
2019-02-25 21:54:08 +00:00
|
|
|
# Some protocol versions (e.g. 2) support fetching
|
|
|
|
# unadvertised objects, so restrict this test to v0.
|
2019-12-24 01:01:10 +00:00
|
|
|
test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
|
2019-02-25 21:54:08 +00:00
|
|
|
git fetch ../testrepo/.git $SHA1_3 &&
|
2019-12-24 01:01:10 +00:00
|
|
|
test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
|
2019-02-25 21:54:08 +00:00
|
|
|
git fetch ../testrepo/.git $SHA1_1 &&
|
2015-05-21 20:23:39 +00:00
|
|
|
git --git-dir=../testrepo/.git config uploadpack.allowreachablesha1inwant true &&
|
|
|
|
git fetch ../testrepo/.git $SHA1_1 &&
|
|
|
|
git cat-file commit $SHA1_1 &&
|
|
|
|
test_must_fail git cat-file commit $SHA1_2 &&
|
|
|
|
git fetch ../testrepo/.git $SHA1_2 &&
|
|
|
|
git cat-file commit $SHA1_2 &&
|
2019-12-24 01:01:10 +00:00
|
|
|
test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
|
2019-04-25 07:41:23 +00:00
|
|
|
git fetch ../testrepo/.git $SHA1_3 2>err &&
|
t5516: loosen "not our ref" error check
Commit 014ade7484 (upload-pack: send ERR packet for non-tip objects,
2019-04-13) added a test that greps the output of a failed fetch to make
sure that upload-pack sent us the ERR packet we expected. But checking
this is racy; despite the argument in that commit, the client may still
be sending a "done" line after the server exits, causing it to die() on
a failed write() and never see the ERR packet at all.
This fails quite rarely on Linux, but more often on macOS. However, it
can be triggered reliably with:
diff --git a/fetch-pack.c b/fetch-pack.c
index 876f90c759..cf40de9092 100644
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -489,6 +489,7 @@ static int find_common(struct fetch_negotiator *negotiator,
done:
trace2_region_leave("fetch-pack", "negotiation_v0_v1", the_repository);
if (!got_ready || !no_done) {
+ sleep(1);
packet_buf_write(&req_buf, "done\n");
send_request(args, fd[1], &req_buf);
}
This is a real user-visible race that it would be nice to fix, but it's
tricky to do so: the client would have to speculatively try to read an
ERR packet after hitting a write() error. And at least for this error,
it's specific to v0 (since v2 does not enforce reachability at all).
So let's loosen the test to avoid annoying racy failures. If we
eventually do the read-after-failed-write thing, we can tighten it. And
if not, v0 will grow increasingly obsolete as servers support v2, so the
utility of this test will decrease over time anyway.
Note that we can still check stderr to make sure upload-pack bailed for
the reason we expected. It writes a similar message to stderr, and
because the server side is just another process connected by pipes,
we'll reliably see it. This would not be the case for git://, or for
ssh servers that do not relay stderr (e.g., GitHub's custom endpoint
does not).
Helped-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-01-10 03:23:09 +00:00
|
|
|
# ideally we would insist this be on a "remote error:"
|
|
|
|
# line, but it is racy; see the commit message
|
|
|
|
test_i18ngrep "not our ref.*$SHA1_3\$" err
|
2015-05-21 20:23:39 +00:00
|
|
|
)
|
|
|
|
'
|
|
|
|
done
|
|
|
|
|
2013-03-04 20:09:50 +00:00
|
|
|
test_expect_success 'fetch follows tags by default' '
|
2020-11-18 23:44:32 +00:00
|
|
|
mk_test testrepo heads/main &&
|
fetch+push tests: use "test_hook" and "test_when_finished" pattern
Change the "t5516-fetch-push.sh" test code to make use of the new
"test_hook" helper, and to use "test_when_finished" to have tests
clean up their own state, instead of relying on subsequent tests to
clean the trash directory.
Before this each test would have been responsible for cleaning up
after a preceding test (which may or may not have run, e.g. if --run
or "GIT_SKIP_TESTS" was used), now each test will instead clean up
after itself.
In order to use both "test_hook" and "test_when_finished" we need to
move them out of sub-shells, which requires some refactoring.
While we're at it split up the "push with negotiation" test, now the
middle of the test doesn't need to "rm event", and since it delimited
two halves that were testing two different things the end-state is
easier to read and reason about.
While changing these lines make the minor change from "-fr" to "-rf"
as the "rm" argument, some of them used it already, it's more common
in the test suite, and it leaves the end-state of the file with more
consistency.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-03-17 10:13:11 +00:00
|
|
|
test_when_finished "rm -rf src" &&
|
2013-03-04 20:09:50 +00:00
|
|
|
git init src &&
|
|
|
|
(
|
|
|
|
cd src &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git pull ../testrepo main &&
|
2013-03-04 20:09:50 +00:00
|
|
|
git tag -m "annotated" tag &&
|
|
|
|
git for-each-ref >tmp1 &&
|
2021-12-09 05:11:01 +00:00
|
|
|
sed -n "p; s|refs/heads/main$|refs/remotes/origin/main|p" tmp1 |
|
2013-03-04 20:09:50 +00:00
|
|
|
sort -k 3 >../expect
|
|
|
|
) &&
|
fetch+push tests: use "test_hook" and "test_when_finished" pattern
Change the "t5516-fetch-push.sh" test code to make use of the new
"test_hook" helper, and to use "test_when_finished" to have tests
clean up their own state, instead of relying on subsequent tests to
clean the trash directory.
Before this each test would have been responsible for cleaning up
after a preceding test (which may or may not have run, e.g. if --run
or "GIT_SKIP_TESTS" was used), now each test will instead clean up
after itself.
In order to use both "test_hook" and "test_when_finished" we need to
move them out of sub-shells, which requires some refactoring.
While we're at it split up the "push with negotiation" test, now the
middle of the test doesn't need to "rm event", and since it delimited
two halves that were testing two different things the end-state is
easier to read and reason about.
While changing these lines make the minor change from "-fr" to "-rf"
as the "rm" argument, some of them used it already, it's more common
in the test suite, and it leaves the end-state of the file with more
consistency.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-03-17 10:13:11 +00:00
|
|
|
test_when_finished "rm -rf dst" &&
|
2013-03-04 20:09:50 +00:00
|
|
|
git init dst &&
|
|
|
|
(
|
|
|
|
cd dst &&
|
|
|
|
git remote add origin ../src &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git config branch.main.remote origin &&
|
|
|
|
git config branch.main.merge refs/heads/main &&
|
2013-03-04 20:09:50 +00:00
|
|
|
git pull &&
|
|
|
|
git for-each-ref >../actual
|
|
|
|
) &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
fetch: do not consider peeled tags as advertised tips
Our filter_refs() function accidentally considers the target of a peeled
tag to be advertised by the server, even though upload-pack on the
server side does not consider it so. This can result in the client
making a bogus fetch to the server, which will end with the server
complaining "not our ref". Whereas the correct behavior is for the
client to notice that the server will not allow the request and error
out immediately.
So as bugs go, this is not very serious (the outcome is the same either
way -- the fetch fails). But it's worth making the logic here correct
and consistent with other related cases (e.g., fetching an oid that the
server did not mention at all).
The crux of the issue comes from fdb69d33c4 (fetch-pack: always allow
fetching of literal SHA1s, 2017-05-15). After that, the strategy of
filter_refs() is basically:
- for each advertised ref, try to match it with a "sought" ref
provided by the user. Skip any malformed refs (which includes
peeled values like "refs/tags/foo^{}"), and place any unmatched
items onto the unmatched list.
- if there are unmatched sought refs, then put all of the advertised
tips into an oidset, including the unmatched ones.
- for each sought ref, see if it's in the oidset, in which case it's
legal for us to ask the server for it
The problem is in the second step. Our list of unmatched refs includes
the peeled refs, even though upload-pack does not allow them to be
directly fetched. So the simplest fix would be to exclude them during
that step.
However, we can observe that the unmatched list isn't used for anything
else, and is freed at the end. We can just free those malformed refs
immediately. That saves us having to check each ref a second time to see
if it's malformed.
Note that this code only kicks in when "strict" is in effect. I.e., if
we are using the v0 protocol and uploadpack.allowReachableSHA1InWant is
not in effect. With v2, all oids are allowed, and we do not bother
creating or consulting the oidset at all. To future-proof our test
against the upcoming GIT_TEST_PROTOCOL_VERSION flag, we'll manually mark
it as a v0-only test.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-04-13 05:57:37 +00:00
|
|
|
test_expect_success 'peeled advertisements are not considered ref tips' '
|
|
|
|
mk_empty testrepo &&
|
|
|
|
git -C testrepo commit --allow-empty -m one &&
|
|
|
|
git -C testrepo commit --allow-empty -m two &&
|
|
|
|
git -C testrepo tag -m foo mytag HEAD^ &&
|
|
|
|
oid=$(git -C testrepo rev-parse mytag^{commit}) &&
|
2019-12-24 01:01:10 +00:00
|
|
|
test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
|
fetch: do not consider peeled tags as advertised tips
Our filter_refs() function accidentally considers the target of a peeled
tag to be advertised by the server, even though upload-pack on the
server side does not consider it so. This can result in the client
making a bogus fetch to the server, which will end with the server
complaining "not our ref". Whereas the correct behavior is for the
client to notice that the server will not allow the request and error
out immediately.
So as bugs go, this is not very serious (the outcome is the same either
way -- the fetch fails). But it's worth making the logic here correct
and consistent with other related cases (e.g., fetching an oid that the
server did not mention at all).
The crux of the issue comes from fdb69d33c4 (fetch-pack: always allow
fetching of literal SHA1s, 2017-05-15). After that, the strategy of
filter_refs() is basically:
- for each advertised ref, try to match it with a "sought" ref
provided by the user. Skip any malformed refs (which includes
peeled values like "refs/tags/foo^{}"), and place any unmatched
items onto the unmatched list.
- if there are unmatched sought refs, then put all of the advertised
tips into an oidset, including the unmatched ones.
- for each sought ref, see if it's in the oidset, in which case it's
legal for us to ask the server for it
The problem is in the second step. Our list of unmatched refs includes
the peeled refs, even though upload-pack does not allow them to be
directly fetched. So the simplest fix would be to exclude them during
that step.
However, we can observe that the unmatched list isn't used for anything
else, and is freed at the end. We can just free those malformed refs
immediately. That saves us having to check each ref a second time to see
if it's malformed.
Note that this code only kicks in when "strict" is in effect. I.e., if
we are using the v0 protocol and uploadpack.allowReachableSHA1InWant is
not in effect. With v2, all oids are allowed, and we do not bother
creating or consulting the oidset at all. To future-proof our test
against the upcoming GIT_TEST_PROTOCOL_VERSION flag, we'll manually mark
it as a v0-only test.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-04-13 05:57:37 +00:00
|
|
|
git fetch testrepo $oid 2>err &&
|
|
|
|
test_i18ngrep "Server does not allow request for unadvertised object" err
|
|
|
|
'
|
|
|
|
|
push: use remote.$name.push as a refmap
Since f2690487 (fetch: opportunistically update tracking refs,
2013-05-11), we stopped taking a non-storing refspec given on the
command line of "git fetch" literally, and instead started mapping
it via remote.$name.fetch refspecs. This allows
$ git fetch origin master
from the 'origin' repository, which is configured with
[remote "origin"]
fetch = +refs/heads/*:refs/remotes/origin/*
to update refs/remotes/origin/master with the result, as if the
command line were
$ git fetch origin +master:refs/remotes/origin/master
to reduce surprises and improve usability. Before that change, a
refspec on the command line without a colon was only to fetch the
history and leave the result in FETCH_HEAD, without updating the
remote-tracking branches.
When you are simulating a fetch from you by your mothership with a
push by you into your mothership, instead of having:
[remote "satellite"]
fetch = +refs/heads/*:refs/remotes/satellite/*
on the mothership repository and running:
mothership$ git fetch satellite
you would have:
[remote "mothership"]
push = +refs/heads/*:refs/remotes/satellite/*
on your satellite machine, and run:
satellite$ git push mothership
Because we so far did not make the corresponding change to the push
side, this command:
satellite$ git push mothership master
does _not_ allow you on the satellite to only push 'master' out but
still to the usual destination (i.e. refs/remotes/satellite/master).
Implement the logic to map an unqualified refspec given on the
command line via the remote.$name.push refspec. This will bring a
bit more symmetry between "fetch" and "push".
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-12-03 23:41:15 +00:00
|
|
|
test_expect_success 'pushing a specific ref applies remote.$name.push as refmap' '
|
2020-11-18 23:44:32 +00:00
|
|
|
mk_test testrepo heads/main &&
|
fetch+push tests: use "test_hook" and "test_when_finished" pattern
Change the "t5516-fetch-push.sh" test code to make use of the new
"test_hook" helper, and to use "test_when_finished" to have tests
clean up their own state, instead of relying on subsequent tests to
clean the trash directory.
Before this each test would have been responsible for cleaning up
after a preceding test (which may or may not have run, e.g. if --run
or "GIT_SKIP_TESTS" was used), now each test will instead clean up
after itself.
In order to use both "test_hook" and "test_when_finished" we need to
move them out of sub-shells, which requires some refactoring.
While we're at it split up the "push with negotiation" test, now the
middle of the test doesn't need to "rm event", and since it delimited
two halves that were testing two different things the end-state is
easier to read and reason about.
While changing these lines make the minor change from "-fr" to "-rf"
as the "rm" argument, some of them used it already, it's more common
in the test suite, and it leaves the end-state of the file with more
consistency.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-03-17 10:13:11 +00:00
|
|
|
test_when_finished "rm -rf src" &&
|
push: use remote.$name.push as a refmap
Since f2690487 (fetch: opportunistically update tracking refs,
2013-05-11), we stopped taking a non-storing refspec given on the
command line of "git fetch" literally, and instead started mapping
it via remote.$name.fetch refspecs. This allows
$ git fetch origin master
from the 'origin' repository, which is configured with
[remote "origin"]
fetch = +refs/heads/*:refs/remotes/origin/*
to update refs/remotes/origin/master with the result, as if the
command line were
$ git fetch origin +master:refs/remotes/origin/master
to reduce surprises and improve usability. Before that change, a
refspec on the command line without a colon was only to fetch the
history and leave the result in FETCH_HEAD, without updating the
remote-tracking branches.
When you are simulating a fetch from you by your mothership with a
push by you into your mothership, instead of having:
[remote "satellite"]
fetch = +refs/heads/*:refs/remotes/satellite/*
on the mothership repository and running:
mothership$ git fetch satellite
you would have:
[remote "mothership"]
push = +refs/heads/*:refs/remotes/satellite/*
on your satellite machine, and run:
satellite$ git push mothership
Because we so far did not make the corresponding change to the push
side, this command:
satellite$ git push mothership master
does _not_ allow you on the satellite to only push 'master' out but
still to the usual destination (i.e. refs/remotes/satellite/master).
Implement the logic to map an unqualified refspec given on the
command line via the remote.$name.push refspec. This will bring a
bit more symmetry between "fetch" and "push".
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-12-03 23:41:15 +00:00
|
|
|
git init src &&
|
fetch+push tests: use "test_hook" and "test_when_finished" pattern
Change the "t5516-fetch-push.sh" test code to make use of the new
"test_hook" helper, and to use "test_when_finished" to have tests
clean up their own state, instead of relying on subsequent tests to
clean the trash directory.
Before this each test would have been responsible for cleaning up
after a preceding test (which may or may not have run, e.g. if --run
or "GIT_SKIP_TESTS" was used), now each test will instead clean up
after itself.
In order to use both "test_hook" and "test_when_finished" we need to
move them out of sub-shells, which requires some refactoring.
While we're at it split up the "push with negotiation" test, now the
middle of the test doesn't need to "rm event", and since it delimited
two halves that were testing two different things the end-state is
easier to read and reason about.
While changing these lines make the minor change from "-fr" to "-rf"
as the "rm" argument, some of them used it already, it's more common
in the test suite, and it leaves the end-state of the file with more
consistency.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-03-17 10:13:11 +00:00
|
|
|
test_when_finished "rm -rf dst" &&
|
push: use remote.$name.push as a refmap
Since f2690487 (fetch: opportunistically update tracking refs,
2013-05-11), we stopped taking a non-storing refspec given on the
command line of "git fetch" literally, and instead started mapping
it via remote.$name.fetch refspecs. This allows
$ git fetch origin master
from the 'origin' repository, which is configured with
[remote "origin"]
fetch = +refs/heads/*:refs/remotes/origin/*
to update refs/remotes/origin/master with the result, as if the
command line were
$ git fetch origin +master:refs/remotes/origin/master
to reduce surprises and improve usability. Before that change, a
refspec on the command line without a colon was only to fetch the
history and leave the result in FETCH_HEAD, without updating the
remote-tracking branches.
When you are simulating a fetch from you by your mothership with a
push by you into your mothership, instead of having:
[remote "satellite"]
fetch = +refs/heads/*:refs/remotes/satellite/*
on the mothership repository and running:
mothership$ git fetch satellite
you would have:
[remote "mothership"]
push = +refs/heads/*:refs/remotes/satellite/*
on your satellite machine, and run:
satellite$ git push mothership
Because we so far did not make the corresponding change to the push
side, this command:
satellite$ git push mothership master
does _not_ allow you on the satellite to only push 'master' out but
still to the usual destination (i.e. refs/remotes/satellite/master).
Implement the logic to map an unqualified refspec given on the
command line via the remote.$name.push refspec. This will bring a
bit more symmetry between "fetch" and "push".
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-12-03 23:41:15 +00:00
|
|
|
git init --bare dst &&
|
|
|
|
(
|
|
|
|
cd src &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git pull ../testrepo main &&
|
push: use remote.$name.push as a refmap
Since f2690487 (fetch: opportunistically update tracking refs,
2013-05-11), we stopped taking a non-storing refspec given on the
command line of "git fetch" literally, and instead started mapping
it via remote.$name.fetch refspecs. This allows
$ git fetch origin master
from the 'origin' repository, which is configured with
[remote "origin"]
fetch = +refs/heads/*:refs/remotes/origin/*
to update refs/remotes/origin/master with the result, as if the
command line were
$ git fetch origin +master:refs/remotes/origin/master
to reduce surprises and improve usability. Before that change, a
refspec on the command line without a colon was only to fetch the
history and leave the result in FETCH_HEAD, without updating the
remote-tracking branches.
When you are simulating a fetch from you by your mothership with a
push by you into your mothership, instead of having:
[remote "satellite"]
fetch = +refs/heads/*:refs/remotes/satellite/*
on the mothership repository and running:
mothership$ git fetch satellite
you would have:
[remote "mothership"]
push = +refs/heads/*:refs/remotes/satellite/*
on your satellite machine, and run:
satellite$ git push mothership
Because we so far did not make the corresponding change to the push
side, this command:
satellite$ git push mothership master
does _not_ allow you on the satellite to only push 'master' out but
still to the usual destination (i.e. refs/remotes/satellite/master).
Implement the logic to map an unqualified refspec given on the
command line via the remote.$name.push refspec. This will bring a
bit more symmetry between "fetch" and "push".
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-12-03 23:41:15 +00:00
|
|
|
git branch next &&
|
|
|
|
git config remote.dst.url ../dst &&
|
|
|
|
git config remote.dst.push "+refs/heads/*:refs/remotes/src/*" &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git push dst main &&
|
|
|
|
git show-ref refs/heads/main |
|
push: use remote.$name.push as a refmap
Since f2690487 (fetch: opportunistically update tracking refs,
2013-05-11), we stopped taking a non-storing refspec given on the
command line of "git fetch" literally, and instead started mapping
it via remote.$name.fetch refspecs. This allows
$ git fetch origin master
from the 'origin' repository, which is configured with
[remote "origin"]
fetch = +refs/heads/*:refs/remotes/origin/*
to update refs/remotes/origin/master with the result, as if the
command line were
$ git fetch origin +master:refs/remotes/origin/master
to reduce surprises and improve usability. Before that change, a
refspec on the command line without a colon was only to fetch the
history and leave the result in FETCH_HEAD, without updating the
remote-tracking branches.
When you are simulating a fetch from you by your mothership with a
push by you into your mothership, instead of having:
[remote "satellite"]
fetch = +refs/heads/*:refs/remotes/satellite/*
on the mothership repository and running:
mothership$ git fetch satellite
you would have:
[remote "mothership"]
push = +refs/heads/*:refs/remotes/satellite/*
on your satellite machine, and run:
satellite$ git push mothership
Because we so far did not make the corresponding change to the push
side, this command:
satellite$ git push mothership master
does _not_ allow you on the satellite to only push 'master' out but
still to the usual destination (i.e. refs/remotes/satellite/master).
Implement the logic to map an unqualified refspec given on the
command line via the remote.$name.push refspec. This will bring a
bit more symmetry between "fetch" and "push".
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-12-03 23:41:15 +00:00
|
|
|
sed -e "s|refs/heads/|refs/remotes/src/|" >../dst/expect
|
|
|
|
) &&
|
|
|
|
(
|
|
|
|
cd dst &&
|
|
|
|
test_must_fail git show-ref refs/heads/next &&
|
2020-11-18 23:44:32 +00:00
|
|
|
test_must_fail git show-ref refs/heads/main &&
|
|
|
|
git show-ref refs/remotes/src/main >actual
|
push: use remote.$name.push as a refmap
Since f2690487 (fetch: opportunistically update tracking refs,
2013-05-11), we stopped taking a non-storing refspec given on the
command line of "git fetch" literally, and instead started mapping
it via remote.$name.fetch refspecs. This allows
$ git fetch origin master
from the 'origin' repository, which is configured with
[remote "origin"]
fetch = +refs/heads/*:refs/remotes/origin/*
to update refs/remotes/origin/master with the result, as if the
command line were
$ git fetch origin +master:refs/remotes/origin/master
to reduce surprises and improve usability. Before that change, a
refspec on the command line without a colon was only to fetch the
history and leave the result in FETCH_HEAD, without updating the
remote-tracking branches.
When you are simulating a fetch from you by your mothership with a
push by you into your mothership, instead of having:
[remote "satellite"]
fetch = +refs/heads/*:refs/remotes/satellite/*
on the mothership repository and running:
mothership$ git fetch satellite
you would have:
[remote "mothership"]
push = +refs/heads/*:refs/remotes/satellite/*
on your satellite machine, and run:
satellite$ git push mothership
Because we so far did not make the corresponding change to the push
side, this command:
satellite$ git push mothership master
does _not_ allow you on the satellite to only push 'master' out but
still to the usual destination (i.e. refs/remotes/satellite/master).
Implement the logic to map an unqualified refspec given on the
command line via the remote.$name.push refspec. This will bring a
bit more symmetry between "fetch" and "push".
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-12-03 23:41:15 +00:00
|
|
|
) &&
|
|
|
|
test_cmp dst/expect dst/actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'with no remote.$name.push, it is not used as refmap' '
|
2020-11-18 23:44:32 +00:00
|
|
|
mk_test testrepo heads/main &&
|
fetch+push tests: use "test_hook" and "test_when_finished" pattern
Change the "t5516-fetch-push.sh" test code to make use of the new
"test_hook" helper, and to use "test_when_finished" to have tests
clean up their own state, instead of relying on subsequent tests to
clean the trash directory.
Before this each test would have been responsible for cleaning up
after a preceding test (which may or may not have run, e.g. if --run
or "GIT_SKIP_TESTS" was used), now each test will instead clean up
after itself.
In order to use both "test_hook" and "test_when_finished" we need to
move them out of sub-shells, which requires some refactoring.
While we're at it split up the "push with negotiation" test, now the
middle of the test doesn't need to "rm event", and since it delimited
two halves that were testing two different things the end-state is
easier to read and reason about.
While changing these lines make the minor change from "-fr" to "-rf"
as the "rm" argument, some of them used it already, it's more common
in the test suite, and it leaves the end-state of the file with more
consistency.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-03-17 10:13:11 +00:00
|
|
|
test_when_finished "rm -rf src" &&
|
push: use remote.$name.push as a refmap
Since f2690487 (fetch: opportunistically update tracking refs,
2013-05-11), we stopped taking a non-storing refspec given on the
command line of "git fetch" literally, and instead started mapping
it via remote.$name.fetch refspecs. This allows
$ git fetch origin master
from the 'origin' repository, which is configured with
[remote "origin"]
fetch = +refs/heads/*:refs/remotes/origin/*
to update refs/remotes/origin/master with the result, as if the
command line were
$ git fetch origin +master:refs/remotes/origin/master
to reduce surprises and improve usability. Before that change, a
refspec on the command line without a colon was only to fetch the
history and leave the result in FETCH_HEAD, without updating the
remote-tracking branches.
When you are simulating a fetch from you by your mothership with a
push by you into your mothership, instead of having:
[remote "satellite"]
fetch = +refs/heads/*:refs/remotes/satellite/*
on the mothership repository and running:
mothership$ git fetch satellite
you would have:
[remote "mothership"]
push = +refs/heads/*:refs/remotes/satellite/*
on your satellite machine, and run:
satellite$ git push mothership
Because we so far did not make the corresponding change to the push
side, this command:
satellite$ git push mothership master
does _not_ allow you on the satellite to only push 'master' out but
still to the usual destination (i.e. refs/remotes/satellite/master).
Implement the logic to map an unqualified refspec given on the
command line via the remote.$name.push refspec. This will bring a
bit more symmetry between "fetch" and "push".
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-12-03 23:41:15 +00:00
|
|
|
git init src &&
|
fetch+push tests: use "test_hook" and "test_when_finished" pattern
Change the "t5516-fetch-push.sh" test code to make use of the new
"test_hook" helper, and to use "test_when_finished" to have tests
clean up their own state, instead of relying on subsequent tests to
clean the trash directory.
Before this each test would have been responsible for cleaning up
after a preceding test (which may or may not have run, e.g. if --run
or "GIT_SKIP_TESTS" was used), now each test will instead clean up
after itself.
In order to use both "test_hook" and "test_when_finished" we need to
move them out of sub-shells, which requires some refactoring.
While we're at it split up the "push with negotiation" test, now the
middle of the test doesn't need to "rm event", and since it delimited
two halves that were testing two different things the end-state is
easier to read and reason about.
While changing these lines make the minor change from "-fr" to "-rf"
as the "rm" argument, some of them used it already, it's more common
in the test suite, and it leaves the end-state of the file with more
consistency.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-03-17 10:13:11 +00:00
|
|
|
test_when_finished "rm -rf dst" &&
|
push: use remote.$name.push as a refmap
Since f2690487 (fetch: opportunistically update tracking refs,
2013-05-11), we stopped taking a non-storing refspec given on the
command line of "git fetch" literally, and instead started mapping
it via remote.$name.fetch refspecs. This allows
$ git fetch origin master
from the 'origin' repository, which is configured with
[remote "origin"]
fetch = +refs/heads/*:refs/remotes/origin/*
to update refs/remotes/origin/master with the result, as if the
command line were
$ git fetch origin +master:refs/remotes/origin/master
to reduce surprises and improve usability. Before that change, a
refspec on the command line without a colon was only to fetch the
history and leave the result in FETCH_HEAD, without updating the
remote-tracking branches.
When you are simulating a fetch from you by your mothership with a
push by you into your mothership, instead of having:
[remote "satellite"]
fetch = +refs/heads/*:refs/remotes/satellite/*
on the mothership repository and running:
mothership$ git fetch satellite
you would have:
[remote "mothership"]
push = +refs/heads/*:refs/remotes/satellite/*
on your satellite machine, and run:
satellite$ git push mothership
Because we so far did not make the corresponding change to the push
side, this command:
satellite$ git push mothership master
does _not_ allow you on the satellite to only push 'master' out but
still to the usual destination (i.e. refs/remotes/satellite/master).
Implement the logic to map an unqualified refspec given on the
command line via the remote.$name.push refspec. This will bring a
bit more symmetry between "fetch" and "push".
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-12-03 23:41:15 +00:00
|
|
|
git init --bare dst &&
|
|
|
|
(
|
|
|
|
cd src &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git pull ../testrepo main &&
|
push: use remote.$name.push as a refmap
Since f2690487 (fetch: opportunistically update tracking refs,
2013-05-11), we stopped taking a non-storing refspec given on the
command line of "git fetch" literally, and instead started mapping
it via remote.$name.fetch refspecs. This allows
$ git fetch origin master
from the 'origin' repository, which is configured with
[remote "origin"]
fetch = +refs/heads/*:refs/remotes/origin/*
to update refs/remotes/origin/master with the result, as if the
command line were
$ git fetch origin +master:refs/remotes/origin/master
to reduce surprises and improve usability. Before that change, a
refspec on the command line without a colon was only to fetch the
history and leave the result in FETCH_HEAD, without updating the
remote-tracking branches.
When you are simulating a fetch from you by your mothership with a
push by you into your mothership, instead of having:
[remote "satellite"]
fetch = +refs/heads/*:refs/remotes/satellite/*
on the mothership repository and running:
mothership$ git fetch satellite
you would have:
[remote "mothership"]
push = +refs/heads/*:refs/remotes/satellite/*
on your satellite machine, and run:
satellite$ git push mothership
Because we so far did not make the corresponding change to the push
side, this command:
satellite$ git push mothership master
does _not_ allow you on the satellite to only push 'master' out but
still to the usual destination (i.e. refs/remotes/satellite/master).
Implement the logic to map an unqualified refspec given on the
command line via the remote.$name.push refspec. This will bring a
bit more symmetry between "fetch" and "push".
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-12-03 23:41:15 +00:00
|
|
|
git branch next &&
|
|
|
|
git config remote.dst.url ../dst &&
|
2013-12-04 00:23:35 +00:00
|
|
|
git config push.default matching &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git push dst main &&
|
|
|
|
git show-ref refs/heads/main >../dst/expect
|
push: use remote.$name.push as a refmap
Since f2690487 (fetch: opportunistically update tracking refs,
2013-05-11), we stopped taking a non-storing refspec given on the
command line of "git fetch" literally, and instead started mapping
it via remote.$name.fetch refspecs. This allows
$ git fetch origin master
from the 'origin' repository, which is configured with
[remote "origin"]
fetch = +refs/heads/*:refs/remotes/origin/*
to update refs/remotes/origin/master with the result, as if the
command line were
$ git fetch origin +master:refs/remotes/origin/master
to reduce surprises and improve usability. Before that change, a
refspec on the command line without a colon was only to fetch the
history and leave the result in FETCH_HEAD, without updating the
remote-tracking branches.
When you are simulating a fetch from you by your mothership with a
push by you into your mothership, instead of having:
[remote "satellite"]
fetch = +refs/heads/*:refs/remotes/satellite/*
on the mothership repository and running:
mothership$ git fetch satellite
you would have:
[remote "mothership"]
push = +refs/heads/*:refs/remotes/satellite/*
on your satellite machine, and run:
satellite$ git push mothership
Because we so far did not make the corresponding change to the push
side, this command:
satellite$ git push mothership master
does _not_ allow you on the satellite to only push 'master' out but
still to the usual destination (i.e. refs/remotes/satellite/master).
Implement the logic to map an unqualified refspec given on the
command line via the remote.$name.push refspec. This will bring a
bit more symmetry between "fetch" and "push".
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-12-03 23:41:15 +00:00
|
|
|
) &&
|
|
|
|
(
|
|
|
|
cd dst &&
|
|
|
|
test_must_fail git show-ref refs/heads/next &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git show-ref refs/heads/main >actual
|
push: use remote.$name.push as a refmap
Since f2690487 (fetch: opportunistically update tracking refs,
2013-05-11), we stopped taking a non-storing refspec given on the
command line of "git fetch" literally, and instead started mapping
it via remote.$name.fetch refspecs. This allows
$ git fetch origin master
from the 'origin' repository, which is configured with
[remote "origin"]
fetch = +refs/heads/*:refs/remotes/origin/*
to update refs/remotes/origin/master with the result, as if the
command line were
$ git fetch origin +master:refs/remotes/origin/master
to reduce surprises and improve usability. Before that change, a
refspec on the command line without a colon was only to fetch the
history and leave the result in FETCH_HEAD, without updating the
remote-tracking branches.
When you are simulating a fetch from you by your mothership with a
push by you into your mothership, instead of having:
[remote "satellite"]
fetch = +refs/heads/*:refs/remotes/satellite/*
on the mothership repository and running:
mothership$ git fetch satellite
you would have:
[remote "mothership"]
push = +refs/heads/*:refs/remotes/satellite/*
on your satellite machine, and run:
satellite$ git push mothership
Because we so far did not make the corresponding change to the push
side, this command:
satellite$ git push mothership master
does _not_ allow you on the satellite to only push 'master' out but
still to the usual destination (i.e. refs/remotes/satellite/master).
Implement the logic to map an unqualified refspec given on the
command line via the remote.$name.push refspec. This will bring a
bit more symmetry between "fetch" and "push".
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-12-03 23:41:15 +00:00
|
|
|
) &&
|
|
|
|
test_cmp dst/expect dst/actual
|
|
|
|
'
|
|
|
|
|
2013-12-04 00:23:35 +00:00
|
|
|
test_expect_success 'with no remote.$name.push, upstream mapping is used' '
|
2020-11-18 23:44:32 +00:00
|
|
|
mk_test testrepo heads/main &&
|
fetch+push tests: use "test_hook" and "test_when_finished" pattern
Change the "t5516-fetch-push.sh" test code to make use of the new
"test_hook" helper, and to use "test_when_finished" to have tests
clean up their own state, instead of relying on subsequent tests to
clean the trash directory.
Before this each test would have been responsible for cleaning up
after a preceding test (which may or may not have run, e.g. if --run
or "GIT_SKIP_TESTS" was used), now each test will instead clean up
after itself.
In order to use both "test_hook" and "test_when_finished" we need to
move them out of sub-shells, which requires some refactoring.
While we're at it split up the "push with negotiation" test, now the
middle of the test doesn't need to "rm event", and since it delimited
two halves that were testing two different things the end-state is
easier to read and reason about.
While changing these lines make the minor change from "-fr" to "-rf"
as the "rm" argument, some of them used it already, it's more common
in the test suite, and it leaves the end-state of the file with more
consistency.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-03-17 10:13:11 +00:00
|
|
|
test_when_finished "rm -rf src" &&
|
2013-12-04 00:23:35 +00:00
|
|
|
git init src &&
|
fetch+push tests: use "test_hook" and "test_when_finished" pattern
Change the "t5516-fetch-push.sh" test code to make use of the new
"test_hook" helper, and to use "test_when_finished" to have tests
clean up their own state, instead of relying on subsequent tests to
clean the trash directory.
Before this each test would have been responsible for cleaning up
after a preceding test (which may or may not have run, e.g. if --run
or "GIT_SKIP_TESTS" was used), now each test will instead clean up
after itself.
In order to use both "test_hook" and "test_when_finished" we need to
move them out of sub-shells, which requires some refactoring.
While we're at it split up the "push with negotiation" test, now the
middle of the test doesn't need to "rm event", and since it delimited
two halves that were testing two different things the end-state is
easier to read and reason about.
While changing these lines make the minor change from "-fr" to "-rf"
as the "rm" argument, some of them used it already, it's more common
in the test suite, and it leaves the end-state of the file with more
consistency.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-03-17 10:13:11 +00:00
|
|
|
test_when_finished "rm -rf dst" &&
|
2013-12-04 00:23:35 +00:00
|
|
|
git init --bare dst &&
|
|
|
|
(
|
|
|
|
cd src &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git pull ../testrepo main &&
|
2013-12-04 00:23:35 +00:00
|
|
|
git branch next &&
|
|
|
|
git config remote.dst.url ../dst &&
|
|
|
|
git config remote.dst.fetch "+refs/heads/*:refs/remotes/dst/*" &&
|
|
|
|
git config push.default upstream &&
|
|
|
|
|
2020-11-18 23:44:32 +00:00
|
|
|
git config branch.main.merge refs/heads/trunk &&
|
|
|
|
git config branch.main.remote dst &&
|
2013-12-04 00:23:35 +00:00
|
|
|
|
2020-11-18 23:44:32 +00:00
|
|
|
git push dst main &&
|
|
|
|
git show-ref refs/heads/main |
|
|
|
|
sed -e "s|refs/heads/main|refs/heads/trunk|" >../dst/expect
|
2013-12-04 00:23:35 +00:00
|
|
|
) &&
|
|
|
|
(
|
|
|
|
cd dst &&
|
2020-11-18 23:44:32 +00:00
|
|
|
test_must_fail git show-ref refs/heads/main &&
|
2013-12-04 00:23:35 +00:00
|
|
|
test_must_fail git show-ref refs/heads/next &&
|
|
|
|
git show-ref refs/heads/trunk >actual
|
|
|
|
) &&
|
|
|
|
test_cmp dst/expect dst/actual
|
|
|
|
'
|
|
|
|
|
2013-03-04 20:09:50 +00:00
|
|
|
test_expect_success 'push does not follow tags by default' '
|
2020-11-18 23:44:32 +00:00
|
|
|
mk_test testrepo heads/main &&
|
fetch+push tests: use "test_hook" and "test_when_finished" pattern
Change the "t5516-fetch-push.sh" test code to make use of the new
"test_hook" helper, and to use "test_when_finished" to have tests
clean up their own state, instead of relying on subsequent tests to
clean the trash directory.
Before this each test would have been responsible for cleaning up
after a preceding test (which may or may not have run, e.g. if --run
or "GIT_SKIP_TESTS" was used), now each test will instead clean up
after itself.
In order to use both "test_hook" and "test_when_finished" we need to
move them out of sub-shells, which requires some refactoring.
While we're at it split up the "push with negotiation" test, now the
middle of the test doesn't need to "rm event", and since it delimited
two halves that were testing two different things the end-state is
easier to read and reason about.
While changing these lines make the minor change from "-fr" to "-rf"
as the "rm" argument, some of them used it already, it's more common
in the test suite, and it leaves the end-state of the file with more
consistency.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-03-17 10:13:11 +00:00
|
|
|
test_when_finished "rm -rf src" &&
|
2013-03-04 20:09:50 +00:00
|
|
|
git init src &&
|
fetch+push tests: use "test_hook" and "test_when_finished" pattern
Change the "t5516-fetch-push.sh" test code to make use of the new
"test_hook" helper, and to use "test_when_finished" to have tests
clean up their own state, instead of relying on subsequent tests to
clean the trash directory.
Before this each test would have been responsible for cleaning up
after a preceding test (which may or may not have run, e.g. if --run
or "GIT_SKIP_TESTS" was used), now each test will instead clean up
after itself.
In order to use both "test_hook" and "test_when_finished" we need to
move them out of sub-shells, which requires some refactoring.
While we're at it split up the "push with negotiation" test, now the
middle of the test doesn't need to "rm event", and since it delimited
two halves that were testing two different things the end-state is
easier to read and reason about.
While changing these lines make the minor change from "-fr" to "-rf"
as the "rm" argument, some of them used it already, it's more common
in the test suite, and it leaves the end-state of the file with more
consistency.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-03-17 10:13:11 +00:00
|
|
|
test_when_finished "rm -rf dst" &&
|
2013-03-04 20:09:50 +00:00
|
|
|
git init --bare dst &&
|
|
|
|
(
|
|
|
|
cd src &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git pull ../testrepo main &&
|
2013-03-04 20:09:50 +00:00
|
|
|
git tag -m "annotated" tag &&
|
|
|
|
git checkout -b another &&
|
|
|
|
git commit --allow-empty -m "future commit" &&
|
|
|
|
git tag -m "future" future &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git checkout main &&
|
|
|
|
git for-each-ref refs/heads/main >../expect &&
|
|
|
|
git push ../dst main
|
2013-03-04 20:09:50 +00:00
|
|
|
) &&
|
|
|
|
(
|
|
|
|
cd dst &&
|
|
|
|
git for-each-ref >../actual
|
|
|
|
) &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2019-03-25 18:14:21 +00:00
|
|
|
test_expect_success 'push --follow-tags only pushes relevant tags' '
|
2020-11-18 23:44:32 +00:00
|
|
|
mk_test testrepo heads/main &&
|
fetch+push tests: use "test_hook" and "test_when_finished" pattern
Change the "t5516-fetch-push.sh" test code to make use of the new
"test_hook" helper, and to use "test_when_finished" to have tests
clean up their own state, instead of relying on subsequent tests to
clean the trash directory.
Before this each test would have been responsible for cleaning up
after a preceding test (which may or may not have run, e.g. if --run
or "GIT_SKIP_TESTS" was used), now each test will instead clean up
after itself.
In order to use both "test_hook" and "test_when_finished" we need to
move them out of sub-shells, which requires some refactoring.
While we're at it split up the "push with negotiation" test, now the
middle of the test doesn't need to "rm event", and since it delimited
two halves that were testing two different things the end-state is
easier to read and reason about.
While changing these lines make the minor change from "-fr" to "-rf"
as the "rm" argument, some of them used it already, it's more common
in the test suite, and it leaves the end-state of the file with more
consistency.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-03-17 10:13:11 +00:00
|
|
|
test_when_finished "rm -rf src" &&
|
2013-03-04 20:09:50 +00:00
|
|
|
git init src &&
|
fetch+push tests: use "test_hook" and "test_when_finished" pattern
Change the "t5516-fetch-push.sh" test code to make use of the new
"test_hook" helper, and to use "test_when_finished" to have tests
clean up their own state, instead of relying on subsequent tests to
clean the trash directory.
Before this each test would have been responsible for cleaning up
after a preceding test (which may or may not have run, e.g. if --run
or "GIT_SKIP_TESTS" was used), now each test will instead clean up
after itself.
In order to use both "test_hook" and "test_when_finished" we need to
move them out of sub-shells, which requires some refactoring.
While we're at it split up the "push with negotiation" test, now the
middle of the test doesn't need to "rm event", and since it delimited
two halves that were testing two different things the end-state is
easier to read and reason about.
While changing these lines make the minor change from "-fr" to "-rf"
as the "rm" argument, some of them used it already, it's more common
in the test suite, and it leaves the end-state of the file with more
consistency.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-03-17 10:13:11 +00:00
|
|
|
test_when_finished "rm -rf dst" &&
|
2013-03-04 20:09:50 +00:00
|
|
|
git init --bare dst &&
|
|
|
|
(
|
|
|
|
cd src &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git pull ../testrepo main &&
|
2013-03-04 20:09:50 +00:00
|
|
|
git tag -m "annotated" tag &&
|
|
|
|
git checkout -b another &&
|
|
|
|
git commit --allow-empty -m "future commit" &&
|
|
|
|
git tag -m "future" future &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git checkout main &&
|
|
|
|
git for-each-ref refs/heads/main refs/tags/tag >../expect &&
|
|
|
|
git push --follow-tags ../dst main
|
2013-03-04 20:09:50 +00:00
|
|
|
) &&
|
|
|
|
(
|
|
|
|
cd dst &&
|
|
|
|
git for-each-ref >../actual
|
|
|
|
) &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2013-08-12 13:55:55 +00:00
|
|
|
test_expect_success 'push --no-thin must produce non-thin pack' '
|
|
|
|
cat >>path1 <<\EOF &&
|
|
|
|
keep base version of path1 big enough, compared to the new changes
|
|
|
|
later, in order to pass size heuristics in
|
|
|
|
builtin/pack-objects.c:try_delta()
|
|
|
|
EOF
|
|
|
|
git commit -am initial &&
|
|
|
|
git init no-thin &&
|
|
|
|
git --git-dir=no-thin/.git config receive.unpacklimit 0 &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git push no-thin/.git refs/heads/main:refs/heads/foo &&
|
2013-08-12 13:55:55 +00:00
|
|
|
echo modified >> path1 &&
|
|
|
|
git commit -am modified &&
|
|
|
|
git repack -adf &&
|
|
|
|
rcvpck="git receive-pack --reject-thin-pack-for-testing" &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git push --no-thin --receive-pack="$rcvpck" no-thin/.git refs/heads/main:refs/heads/foo
|
2013-08-12 13:55:55 +00:00
|
|
|
'
|
|
|
|
|
2014-10-17 00:03:41 +00:00
|
|
|
test_expect_success 'pushing a tag pushes the tagged object' '
|
|
|
|
blob=$(echo unreferenced | git hash-object -w --stdin) &&
|
|
|
|
git tag -m foo tag-of-blob $blob &&
|
fetch+push tests: use "test_hook" and "test_when_finished" pattern
Change the "t5516-fetch-push.sh" test code to make use of the new
"test_hook" helper, and to use "test_when_finished" to have tests
clean up their own state, instead of relying on subsequent tests to
clean the trash directory.
Before this each test would have been responsible for cleaning up
after a preceding test (which may or may not have run, e.g. if --run
or "GIT_SKIP_TESTS" was used), now each test will instead clean up
after itself.
In order to use both "test_hook" and "test_when_finished" we need to
move them out of sub-shells, which requires some refactoring.
While we're at it split up the "push with negotiation" test, now the
middle of the test doesn't need to "rm event", and since it delimited
two halves that were testing two different things the end-state is
easier to read and reason about.
While changing these lines make the minor change from "-fr" to "-rf"
as the "rm" argument, some of them used it already, it's more common
in the test suite, and it leaves the end-state of the file with more
consistency.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-03-17 10:13:11 +00:00
|
|
|
test_when_finished "rm -rf dst.git" &&
|
2014-10-17 00:03:41 +00:00
|
|
|
git init --bare dst.git &&
|
|
|
|
git push dst.git tag-of-blob &&
|
|
|
|
# the receiving index-pack should have noticed
|
|
|
|
# any problems, but we double check
|
|
|
|
echo unreferenced >expect &&
|
|
|
|
git --git-dir=dst.git cat-file blob tag-of-blob >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
fetch: load all default config at startup
When we start the git-fetch program, we call git_config to
load all config, but our callback only processes the
fetch.prune option; we do not chain to git_default_config at
all.
This means that we may not load some core configuration
which will have an effect. For instance, we do not load
core.logAllRefUpdates, which impacts whether or not we
create reflogs in a bare repository.
Note that I said "may" above. It gets even more exciting. If
we have to transfer actual objects as part of the fetch,
then we call fetch_pack as part of the same process. That
function loads its own config, which does chain to
git_default_config, impacting global variables which are
used by the rest of fetch. But if the fetch is a pure ref
update (e.g., a new ref which is a copy of an old one), we
skip fetch_pack entirely. So we get inconsistent results
depending on whether or not we have actual objects to
transfer or not!
Let's just load the core config at the start of fetch, so we
know we have it (we may also load it again as part of
fetch_pack, but that's OK; it's designed to be idempotent).
Our tests check both cases (with and without a pack). We
also check similar behavior for push for good measure, but
it already works as expected.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-11-04 13:11:19 +00:00
|
|
|
test_expect_success 'push into bare respects core.logallrefupdates' '
|
fetch+push tests: use "test_hook" and "test_when_finished" pattern
Change the "t5516-fetch-push.sh" test code to make use of the new
"test_hook" helper, and to use "test_when_finished" to have tests
clean up their own state, instead of relying on subsequent tests to
clean the trash directory.
Before this each test would have been responsible for cleaning up
after a preceding test (which may or may not have run, e.g. if --run
or "GIT_SKIP_TESTS" was used), now each test will instead clean up
after itself.
In order to use both "test_hook" and "test_when_finished" we need to
move them out of sub-shells, which requires some refactoring.
While we're at it split up the "push with negotiation" test, now the
middle of the test doesn't need to "rm event", and since it delimited
two halves that were testing two different things the end-state is
easier to read and reason about.
While changing these lines make the minor change from "-fr" to "-rf"
as the "rm" argument, some of them used it already, it's more common
in the test suite, and it leaves the end-state of the file with more
consistency.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-03-17 10:13:11 +00:00
|
|
|
test_when_finished "rm -rf dst.git" &&
|
fetch: load all default config at startup
When we start the git-fetch program, we call git_config to
load all config, but our callback only processes the
fetch.prune option; we do not chain to git_default_config at
all.
This means that we may not load some core configuration
which will have an effect. For instance, we do not load
core.logAllRefUpdates, which impacts whether or not we
create reflogs in a bare repository.
Note that I said "may" above. It gets even more exciting. If
we have to transfer actual objects as part of the fetch,
then we call fetch_pack as part of the same process. That
function loads its own config, which does chain to
git_default_config, impacting global variables which are
used by the rest of fetch. But if the fetch is a pure ref
update (e.g., a new ref which is a copy of an old one), we
skip fetch_pack entirely. So we get inconsistent results
depending on whether or not we have actual objects to
transfer or not!
Let's just load the core config at the start of fetch, so we
know we have it (we may also load it again as part of
fetch_pack, but that's OK; it's designed to be idempotent).
Our tests check both cases (with and without a pack). We
also check similar behavior for push for good measure, but
it already works as expected.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-11-04 13:11:19 +00:00
|
|
|
git init --bare dst.git &&
|
|
|
|
git -C dst.git config core.logallrefupdates true &&
|
|
|
|
|
|
|
|
# double push to test both with and without
|
|
|
|
# the actual pack transfer
|
2020-11-18 23:44:32 +00:00
|
|
|
git push dst.git main:one &&
|
fetch: load all default config at startup
When we start the git-fetch program, we call git_config to
load all config, but our callback only processes the
fetch.prune option; we do not chain to git_default_config at
all.
This means that we may not load some core configuration
which will have an effect. For instance, we do not load
core.logAllRefUpdates, which impacts whether or not we
create reflogs in a bare repository.
Note that I said "may" above. It gets even more exciting. If
we have to transfer actual objects as part of the fetch,
then we call fetch_pack as part of the same process. That
function loads its own config, which does chain to
git_default_config, impacting global variables which are
used by the rest of fetch. But if the fetch is a pure ref
update (e.g., a new ref which is a copy of an old one), we
skip fetch_pack entirely. So we get inconsistent results
depending on whether or not we have actual objects to
transfer or not!
Let's just load the core config at the start of fetch, so we
know we have it (we may also load it again as part of
fetch_pack, but that's OK; it's designed to be idempotent).
Our tests check both cases (with and without a pack). We
also check similar behavior for push for good measure, but
it already works as expected.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-11-04 13:11:19 +00:00
|
|
|
echo "one@{0} push" >expect &&
|
|
|
|
git -C dst.git log -g --format="%gd %gs" one >actual &&
|
|
|
|
test_cmp expect actual &&
|
|
|
|
|
2020-11-18 23:44:32 +00:00
|
|
|
git push dst.git main:two &&
|
fetch: load all default config at startup
When we start the git-fetch program, we call git_config to
load all config, but our callback only processes the
fetch.prune option; we do not chain to git_default_config at
all.
This means that we may not load some core configuration
which will have an effect. For instance, we do not load
core.logAllRefUpdates, which impacts whether or not we
create reflogs in a bare repository.
Note that I said "may" above. It gets even more exciting. If
we have to transfer actual objects as part of the fetch,
then we call fetch_pack as part of the same process. That
function loads its own config, which does chain to
git_default_config, impacting global variables which are
used by the rest of fetch. But if the fetch is a pure ref
update (e.g., a new ref which is a copy of an old one), we
skip fetch_pack entirely. So we get inconsistent results
depending on whether or not we have actual objects to
transfer or not!
Let's just load the core config at the start of fetch, so we
know we have it (we may also load it again as part of
fetch_pack, but that's OK; it's designed to be idempotent).
Our tests check both cases (with and without a pack). We
also check similar behavior for push for good measure, but
it already works as expected.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-11-04 13:11:19 +00:00
|
|
|
echo "two@{0} push" >expect &&
|
|
|
|
git -C dst.git log -g --format="%gd %gs" two >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'fetch into bare respects core.logallrefupdates' '
|
fetch+push tests: use "test_hook" and "test_when_finished" pattern
Change the "t5516-fetch-push.sh" test code to make use of the new
"test_hook" helper, and to use "test_when_finished" to have tests
clean up their own state, instead of relying on subsequent tests to
clean the trash directory.
Before this each test would have been responsible for cleaning up
after a preceding test (which may or may not have run, e.g. if --run
or "GIT_SKIP_TESTS" was used), now each test will instead clean up
after itself.
In order to use both "test_hook" and "test_when_finished" we need to
move them out of sub-shells, which requires some refactoring.
While we're at it split up the "push with negotiation" test, now the
middle of the test doesn't need to "rm event", and since it delimited
two halves that were testing two different things the end-state is
easier to read and reason about.
While changing these lines make the minor change from "-fr" to "-rf"
as the "rm" argument, some of them used it already, it's more common
in the test suite, and it leaves the end-state of the file with more
consistency.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-03-17 10:13:11 +00:00
|
|
|
test_when_finished "rm -rf dst.git" &&
|
fetch: load all default config at startup
When we start the git-fetch program, we call git_config to
load all config, but our callback only processes the
fetch.prune option; we do not chain to git_default_config at
all.
This means that we may not load some core configuration
which will have an effect. For instance, we do not load
core.logAllRefUpdates, which impacts whether or not we
create reflogs in a bare repository.
Note that I said "may" above. It gets even more exciting. If
we have to transfer actual objects as part of the fetch,
then we call fetch_pack as part of the same process. That
function loads its own config, which does chain to
git_default_config, impacting global variables which are
used by the rest of fetch. But if the fetch is a pure ref
update (e.g., a new ref which is a copy of an old one), we
skip fetch_pack entirely. So we get inconsistent results
depending on whether or not we have actual objects to
transfer or not!
Let's just load the core config at the start of fetch, so we
know we have it (we may also load it again as part of
fetch_pack, but that's OK; it's designed to be idempotent).
Our tests check both cases (with and without a pack). We
also check similar behavior for push for good measure, but
it already works as expected.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-11-04 13:11:19 +00:00
|
|
|
git init --bare dst.git &&
|
|
|
|
(
|
|
|
|
cd dst.git &&
|
|
|
|
git config core.logallrefupdates true &&
|
|
|
|
|
|
|
|
# as above, we double-fetch to test both
|
|
|
|
# with and without pack transfer
|
2020-11-18 23:44:32 +00:00
|
|
|
git fetch .. main:one &&
|
|
|
|
echo "one@{0} fetch .. main:one: storing head" >expect &&
|
fetch: load all default config at startup
When we start the git-fetch program, we call git_config to
load all config, but our callback only processes the
fetch.prune option; we do not chain to git_default_config at
all.
This means that we may not load some core configuration
which will have an effect. For instance, we do not load
core.logAllRefUpdates, which impacts whether or not we
create reflogs in a bare repository.
Note that I said "may" above. It gets even more exciting. If
we have to transfer actual objects as part of the fetch,
then we call fetch_pack as part of the same process. That
function loads its own config, which does chain to
git_default_config, impacting global variables which are
used by the rest of fetch. But if the fetch is a pure ref
update (e.g., a new ref which is a copy of an old one), we
skip fetch_pack entirely. So we get inconsistent results
depending on whether or not we have actual objects to
transfer or not!
Let's just load the core config at the start of fetch, so we
know we have it (we may also load it again as part of
fetch_pack, but that's OK; it's designed to be idempotent).
Our tests check both cases (with and without a pack). We
also check similar behavior for push for good measure, but
it already works as expected.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-11-04 13:11:19 +00:00
|
|
|
git log -g --format="%gd %gs" one >actual &&
|
|
|
|
test_cmp expect actual &&
|
|
|
|
|
2020-11-18 23:44:32 +00:00
|
|
|
git fetch .. main:two &&
|
|
|
|
echo "two@{0} fetch .. main:two: storing head" >expect &&
|
fetch: load all default config at startup
When we start the git-fetch program, we call git_config to
load all config, but our callback only processes the
fetch.prune option; we do not chain to git_default_config at
all.
This means that we may not load some core configuration
which will have an effect. For instance, we do not load
core.logAllRefUpdates, which impacts whether or not we
create reflogs in a bare repository.
Note that I said "may" above. It gets even more exciting. If
we have to transfer actual objects as part of the fetch,
then we call fetch_pack as part of the same process. That
function loads its own config, which does chain to
git_default_config, impacting global variables which are
used by the rest of fetch. But if the fetch is a pure ref
update (e.g., a new ref which is a copy of an old one), we
skip fetch_pack entirely. So we get inconsistent results
depending on whether or not we have actual objects to
transfer or not!
Let's just load the core config at the start of fetch, so we
know we have it (we may also load it again as part of
fetch_pack, but that's OK; it's designed to be idempotent).
Our tests check both cases (with and without a pack). We
also check similar behavior for push for good measure, but
it already works as expected.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-11-04 13:11:19 +00:00
|
|
|
git log -g --format="%gd %gs" two >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2014-11-26 22:44:16 +00:00
|
|
|
test_expect_success 'receive.denyCurrentBranch = updateInstead' '
|
fetch+push tests: use "test_hook" and "test_when_finished" pattern
Change the "t5516-fetch-push.sh" test code to make use of the new
"test_hook" helper, and to use "test_when_finished" to have tests
clean up their own state, instead of relying on subsequent tests to
clean the trash directory.
Before this each test would have been responsible for cleaning up
after a preceding test (which may or may not have run, e.g. if --run
or "GIT_SKIP_TESTS" was used), now each test will instead clean up
after itself.
In order to use both "test_hook" and "test_when_finished" we need to
move them out of sub-shells, which requires some refactoring.
While we're at it split up the "push with negotiation" test, now the
middle of the test doesn't need to "rm event", and since it delimited
two halves that were testing two different things the end-state is
easier to read and reason about.
While changing these lines make the minor change from "-fr" to "-rf"
as the "rm" argument, some of them used it already, it's more common
in the test suite, and it leaves the end-state of the file with more
consistency.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-03-17 10:13:11 +00:00
|
|
|
mk_empty testrepo &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git push testrepo main &&
|
2014-12-01 01:54:30 +00:00
|
|
|
(
|
|
|
|
cd testrepo &&
|
2014-11-26 22:44:16 +00:00
|
|
|
git reset --hard &&
|
|
|
|
git config receive.denyCurrentBranch updateInstead
|
|
|
|
) &&
|
|
|
|
test_commit third path2 &&
|
2014-12-01 01:54:30 +00:00
|
|
|
|
|
|
|
# Try pushing into a repository with pristine working tree
|
2020-11-18 23:44:32 +00:00
|
|
|
git push testrepo main &&
|
2014-12-01 01:54:30 +00:00
|
|
|
(
|
|
|
|
cd testrepo &&
|
|
|
|
git update-index -q --refresh &&
|
|
|
|
git diff-files --quiet -- &&
|
|
|
|
git diff-index --quiet --cached HEAD -- &&
|
|
|
|
test third = "$(cat path2)" &&
|
|
|
|
test $(git -C .. rev-parse HEAD) = $(git rev-parse HEAD)
|
|
|
|
) &&
|
|
|
|
|
|
|
|
# Try pushing into a repository with working tree needing a refresh
|
|
|
|
(
|
|
|
|
cd testrepo &&
|
|
|
|
git reset --hard HEAD^ &&
|
|
|
|
test $(git -C .. rev-parse HEAD^) = $(git rev-parse HEAD) &&
|
2018-03-24 07:44:31 +00:00
|
|
|
test-tool chmtime +100 path1
|
2014-12-01 01:54:30 +00:00
|
|
|
) &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git push testrepo main &&
|
2014-12-01 01:54:30 +00:00
|
|
|
(
|
|
|
|
cd testrepo &&
|
2014-11-26 22:44:16 +00:00
|
|
|
git update-index -q --refresh &&
|
|
|
|
git diff-files --quiet -- &&
|
|
|
|
git diff-index --quiet --cached HEAD -- &&
|
2014-12-01 01:54:30 +00:00
|
|
|
test_cmp ../path1 path1 &&
|
|
|
|
test third = "$(cat path2)" &&
|
|
|
|
test $(git -C .. rev-parse HEAD) = $(git rev-parse HEAD)
|
2014-11-26 22:44:16 +00:00
|
|
|
) &&
|
2014-12-01 01:54:30 +00:00
|
|
|
|
|
|
|
# Update what is to be pushed
|
2014-11-26 22:44:16 +00:00
|
|
|
test_commit fourth path2 &&
|
2014-12-01 01:54:30 +00:00
|
|
|
|
|
|
|
# Try pushing into a repository with a dirty working tree
|
|
|
|
# (1) the working tree updated
|
|
|
|
(
|
|
|
|
cd testrepo &&
|
|
|
|
echo changed >path1
|
|
|
|
) &&
|
2020-11-18 23:44:32 +00:00
|
|
|
test_must_fail git push testrepo main &&
|
2014-12-01 01:54:30 +00:00
|
|
|
(
|
|
|
|
cd testrepo &&
|
|
|
|
test $(git -C .. rev-parse HEAD^) = $(git rev-parse HEAD) &&
|
|
|
|
git diff --quiet --cached &&
|
|
|
|
test changed = "$(cat path1)"
|
|
|
|
) &&
|
|
|
|
|
|
|
|
# (2) the index updated
|
|
|
|
(
|
|
|
|
cd testrepo &&
|
|
|
|
echo changed >path1 &&
|
|
|
|
git add path1
|
|
|
|
) &&
|
2020-11-18 23:44:32 +00:00
|
|
|
test_must_fail git push testrepo main &&
|
2014-12-01 01:54:30 +00:00
|
|
|
(
|
|
|
|
cd testrepo &&
|
|
|
|
test $(git -C .. rev-parse HEAD^) = $(git rev-parse HEAD) &&
|
|
|
|
git diff --quiet &&
|
|
|
|
test changed = "$(cat path1)"
|
|
|
|
) &&
|
|
|
|
|
|
|
|
# Introduce a new file in the update
|
|
|
|
test_commit fifth path3 &&
|
|
|
|
|
|
|
|
# (3) the working tree has an untracked file that would interfere
|
|
|
|
(
|
|
|
|
cd testrepo &&
|
|
|
|
git reset --hard &&
|
|
|
|
echo changed >path3
|
|
|
|
) &&
|
2020-11-18 23:44:32 +00:00
|
|
|
test_must_fail git push testrepo main &&
|
2014-12-01 01:54:30 +00:00
|
|
|
(
|
|
|
|
cd testrepo &&
|
|
|
|
test $(git -C .. rev-parse HEAD^^) = $(git rev-parse HEAD) &&
|
|
|
|
git diff --quiet &&
|
|
|
|
git diff --quiet --cached &&
|
|
|
|
test changed = "$(cat path3)"
|
|
|
|
) &&
|
|
|
|
|
|
|
|
# (4) the target changes to what gets pushed but it still is a change
|
|
|
|
(
|
|
|
|
cd testrepo &&
|
|
|
|
git reset --hard &&
|
|
|
|
echo fifth >path3 &&
|
|
|
|
git add path3
|
|
|
|
) &&
|
2020-11-18 23:44:32 +00:00
|
|
|
test_must_fail git push testrepo main &&
|
2014-12-01 01:54:30 +00:00
|
|
|
(
|
|
|
|
cd testrepo &&
|
|
|
|
test $(git -C .. rev-parse HEAD^^) = $(git rev-parse HEAD) &&
|
2014-11-26 22:44:16 +00:00
|
|
|
git diff --quiet &&
|
2014-12-01 01:54:30 +00:00
|
|
|
test fifth = "$(cat path3)"
|
2015-04-01 06:15:45 +00:00
|
|
|
) &&
|
2014-12-01 01:54:30 +00:00
|
|
|
|
2015-04-01 06:15:45 +00:00
|
|
|
# (5) push into void
|
fetch+push tests: use "test_hook" and "test_when_finished" pattern
Change the "t5516-fetch-push.sh" test code to make use of the new
"test_hook" helper, and to use "test_when_finished" to have tests
clean up their own state, instead of relying on subsequent tests to
clean the trash directory.
Before this each test would have been responsible for cleaning up
after a preceding test (which may or may not have run, e.g. if --run
or "GIT_SKIP_TESTS" was used), now each test will instead clean up
after itself.
In order to use both "test_hook" and "test_when_finished" we need to
move them out of sub-shells, which requires some refactoring.
While we're at it split up the "push with negotiation" test, now the
middle of the test doesn't need to "rm event", and since it delimited
two halves that were testing two different things the end-state is
easier to read and reason about.
While changing these lines make the minor change from "-fr" to "-rf"
as the "rm" argument, some of them used it already, it's more common
in the test suite, and it leaves the end-state of the file with more
consistency.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-03-17 10:13:11 +00:00
|
|
|
test_when_finished "rm -rf void" &&
|
2015-04-01 06:15:45 +00:00
|
|
|
git init void &&
|
|
|
|
(
|
|
|
|
cd void &&
|
|
|
|
git config receive.denyCurrentBranch updateInstead
|
|
|
|
) &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git push void main &&
|
2015-04-01 06:15:45 +00:00
|
|
|
(
|
|
|
|
cd void &&
|
2020-11-18 23:44:32 +00:00
|
|
|
test $(git -C .. rev-parse main) = $(git rev-parse HEAD) &&
|
2015-04-01 06:15:45 +00:00
|
|
|
git diff --quiet &&
|
|
|
|
git diff --cached --quiet
|
2018-10-19 04:57:35 +00:00
|
|
|
) &&
|
|
|
|
|
|
|
|
# (6) updateInstead intervened by fast-forward check
|
2020-11-18 23:44:32 +00:00
|
|
|
test_must_fail git push void main^:main &&
|
|
|
|
test $(git -C void rev-parse HEAD) = $(git rev-parse main) &&
|
2018-10-19 04:57:35 +00:00
|
|
|
git -C void diff --quiet &&
|
|
|
|
git -C void diff --cached --quiet
|
2014-11-26 22:44:16 +00:00
|
|
|
'
|
|
|
|
|
2014-12-01 23:29:54 +00:00
|
|
|
test_expect_success 'updateInstead with push-to-checkout hook' '
|
fetch+push tests: use "test_hook" and "test_when_finished" pattern
Change the "t5516-fetch-push.sh" test code to make use of the new
"test_hook" helper, and to use "test_when_finished" to have tests
clean up their own state, instead of relying on subsequent tests to
clean the trash directory.
Before this each test would have been responsible for cleaning up
after a preceding test (which may or may not have run, e.g. if --run
or "GIT_SKIP_TESTS" was used), now each test will instead clean up
after itself.
In order to use both "test_hook" and "test_when_finished" we need to
move them out of sub-shells, which requires some refactoring.
While we're at it split up the "push with negotiation" test, now the
middle of the test doesn't need to "rm event", and since it delimited
two halves that were testing two different things the end-state is
easier to read and reason about.
While changing these lines make the minor change from "-fr" to "-rf"
as the "rm" argument, some of them used it already, it's more common
in the test suite, and it leaves the end-state of the file with more
consistency.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-03-17 10:13:11 +00:00
|
|
|
test_when_finished "rm -rf testrepo" &&
|
2014-12-01 23:29:54 +00:00
|
|
|
git init testrepo &&
|
fetch+push tests: use "test_hook" and "test_when_finished" pattern
Change the "t5516-fetch-push.sh" test code to make use of the new
"test_hook" helper, and to use "test_when_finished" to have tests
clean up their own state, instead of relying on subsequent tests to
clean the trash directory.
Before this each test would have been responsible for cleaning up
after a preceding test (which may or may not have run, e.g. if --run
or "GIT_SKIP_TESTS" was used), now each test will instead clean up
after itself.
In order to use both "test_hook" and "test_when_finished" we need to
move them out of sub-shells, which requires some refactoring.
While we're at it split up the "push with negotiation" test, now the
middle of the test doesn't need to "rm event", and since it delimited
two halves that were testing two different things the end-state is
easier to read and reason about.
While changing these lines make the minor change from "-fr" to "-rf"
as the "rm" argument, some of them used it already, it's more common
in the test suite, and it leaves the end-state of the file with more
consistency.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-03-17 10:13:11 +00:00
|
|
|
git -C testrepo pull .. main &&
|
|
|
|
git -C testrepo reset --hard HEAD^^ &&
|
|
|
|
git -C testrepo tag initial &&
|
|
|
|
git -C testrepo config receive.denyCurrentBranch updateInstead &&
|
|
|
|
test_hook -C testrepo push-to-checkout <<-\EOF &&
|
|
|
|
echo >&2 updating from $(git rev-parse HEAD)
|
|
|
|
echo >&2 updating to "$1"
|
|
|
|
|
|
|
|
git update-index -q --refresh &&
|
|
|
|
git read-tree -u -m HEAD "$1" || {
|
|
|
|
status=$?
|
|
|
|
echo >&2 read-tree failed
|
|
|
|
exit $status
|
|
|
|
}
|
|
|
|
EOF
|
2014-12-01 23:29:54 +00:00
|
|
|
|
|
|
|
# Try pushing into a pristine
|
2020-11-18 23:44:32 +00:00
|
|
|
git push testrepo main &&
|
2014-12-01 23:29:54 +00:00
|
|
|
(
|
|
|
|
cd testrepo &&
|
|
|
|
git diff --quiet &&
|
|
|
|
git diff HEAD --quiet &&
|
|
|
|
test $(git -C .. rev-parse HEAD) = $(git rev-parse HEAD)
|
|
|
|
) &&
|
|
|
|
|
|
|
|
# Try pushing into a repository with conflicting change
|
|
|
|
(
|
|
|
|
cd testrepo &&
|
|
|
|
git reset --hard initial &&
|
|
|
|
echo conflicting >path2
|
|
|
|
) &&
|
2020-11-18 23:44:32 +00:00
|
|
|
test_must_fail git push testrepo main &&
|
2014-12-01 23:29:54 +00:00
|
|
|
(
|
|
|
|
cd testrepo &&
|
|
|
|
test $(git rev-parse initial) = $(git rev-parse HEAD) &&
|
|
|
|
test conflicting = "$(cat path2)" &&
|
|
|
|
git diff-index --quiet --cached HEAD
|
|
|
|
) &&
|
|
|
|
|
|
|
|
# Try pushing into a repository with unrelated change
|
|
|
|
(
|
|
|
|
cd testrepo &&
|
|
|
|
git reset --hard initial &&
|
|
|
|
echo unrelated >path1 &&
|
|
|
|
echo irrelevant >path5 &&
|
|
|
|
git add path5
|
|
|
|
) &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git push testrepo main &&
|
2014-12-01 23:29:54 +00:00
|
|
|
(
|
|
|
|
cd testrepo &&
|
|
|
|
test "$(cat path1)" = unrelated &&
|
|
|
|
test "$(cat path5)" = irrelevant &&
|
|
|
|
test "$(git diff --name-only --cached HEAD)" = path5 &&
|
|
|
|
test $(git -C .. rev-parse HEAD) = $(git rev-parse HEAD)
|
2015-04-01 06:15:45 +00:00
|
|
|
) &&
|
|
|
|
|
|
|
|
# push into void
|
fetch+push tests: use "test_hook" and "test_when_finished" pattern
Change the "t5516-fetch-push.sh" test code to make use of the new
"test_hook" helper, and to use "test_when_finished" to have tests
clean up their own state, instead of relying on subsequent tests to
clean the trash directory.
Before this each test would have been responsible for cleaning up
after a preceding test (which may or may not have run, e.g. if --run
or "GIT_SKIP_TESTS" was used), now each test will instead clean up
after itself.
In order to use both "test_hook" and "test_when_finished" we need to
move them out of sub-shells, which requires some refactoring.
While we're at it split up the "push with negotiation" test, now the
middle of the test doesn't need to "rm event", and since it delimited
two halves that were testing two different things the end-state is
easier to read and reason about.
While changing these lines make the minor change from "-fr" to "-rf"
as the "rm" argument, some of them used it already, it's more common
in the test suite, and it leaves the end-state of the file with more
consistency.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-03-17 10:13:11 +00:00
|
|
|
test_when_finished "rm -rf void" &&
|
2015-04-01 06:15:45 +00:00
|
|
|
git init void &&
|
fetch+push tests: use "test_hook" and "test_when_finished" pattern
Change the "t5516-fetch-push.sh" test code to make use of the new
"test_hook" helper, and to use "test_when_finished" to have tests
clean up their own state, instead of relying on subsequent tests to
clean the trash directory.
Before this each test would have been responsible for cleaning up
after a preceding test (which may or may not have run, e.g. if --run
or "GIT_SKIP_TESTS" was used), now each test will instead clean up
after itself.
In order to use both "test_hook" and "test_when_finished" we need to
move them out of sub-shells, which requires some refactoring.
While we're at it split up the "push with negotiation" test, now the
middle of the test doesn't need to "rm event", and since it delimited
two halves that were testing two different things the end-state is
easier to read and reason about.
While changing these lines make the minor change from "-fr" to "-rf"
as the "rm" argument, some of them used it already, it's more common
in the test suite, and it leaves the end-state of the file with more
consistency.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-03-17 10:13:11 +00:00
|
|
|
git -C void config receive.denyCurrentBranch updateInstead &&
|
|
|
|
test_hook -C void push-to-checkout <<-\EOF &&
|
|
|
|
if git rev-parse --quiet --verify HEAD
|
|
|
|
then
|
|
|
|
has_head=yes
|
|
|
|
echo >&2 updating from $(git rev-parse HEAD)
|
|
|
|
else
|
|
|
|
has_head=no
|
|
|
|
echo >&2 pushing into void
|
|
|
|
fi
|
|
|
|
echo >&2 updating to "$1"
|
|
|
|
|
|
|
|
git update-index -q --refresh &&
|
|
|
|
case "$has_head" in
|
|
|
|
yes)
|
|
|
|
git read-tree -u -m HEAD "$1" ;;
|
|
|
|
no)
|
|
|
|
git read-tree -u -m "$1" ;;
|
|
|
|
esac || {
|
|
|
|
status=$?
|
|
|
|
echo >&2 read-tree failed
|
|
|
|
exit $status
|
|
|
|
}
|
|
|
|
EOF
|
2015-04-01 06:15:45 +00:00
|
|
|
|
2020-11-18 23:44:32 +00:00
|
|
|
git push void main &&
|
2015-04-01 06:15:45 +00:00
|
|
|
(
|
|
|
|
cd void &&
|
|
|
|
git diff --quiet &&
|
|
|
|
git diff --cached --quiet &&
|
|
|
|
test $(git -C .. rev-parse HEAD) = $(git rev-parse HEAD)
|
2014-12-01 23:29:54 +00:00
|
|
|
)
|
|
|
|
'
|
|
|
|
|
receive.denyCurrentBranch: respect all worktrees
The receive.denyCurrentBranch config option controls what happens if
you push to a branch that is checked out into a non-bare repository.
By default, it rejects it. It can be disabled via `ignore` or `warn`.
Another yet trickier option is `updateInstead`.
However, this setting was forgotten when the git worktree command was
introduced: only the main worktree's current branch is respected.
With this change, all worktrees are respected.
That change also leads to revealing another bug,
i.e. `receive.denyCurrentBranch = true` was ignored when pushing into a
non-bare repository's unborn current branch using ref namespaces. As
`is_ref_checked_out()` returns 0 which means `receive-pack` does not get
into conditional statement to switch `deny_current_branch` accordingly
(ignore, warn, refuse, unconfigured, updateInstead).
receive.denyCurrentBranch uses the function `refs_resolve_ref_unsafe()`
(called via `resolve_refdup()`) to resolve the symbolic ref HEAD, but
that function fails when HEAD does not point at a valid commit.
As we replace the call to `refs_resolve_ref_unsafe()` with
`find_shared_symref()`, which has no problem finding the worktree for a
given branch even if it is unborn yet, this bug is fixed at the same
time: receive.denyCurrentBranch now also handles worktrees with unborn
branches as intended even while using ref namespaces.
Helped-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Hariom Verma <hariom18599@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-02-23 18:57:10 +00:00
|
|
|
test_expect_success 'denyCurrentBranch and worktrees' '
|
|
|
|
git worktree add new-wt &&
|
|
|
|
git clone . cloned &&
|
|
|
|
test_commit -C cloned first &&
|
|
|
|
test_config receive.denyCurrentBranch refuse &&
|
|
|
|
test_must_fail git -C cloned push origin HEAD:new-wt &&
|
|
|
|
test_config receive.denyCurrentBranch updateInstead &&
|
|
|
|
git -C cloned push origin HEAD:new-wt &&
|
2021-12-01 22:15:46 +00:00
|
|
|
test_path_exists new-wt/first.t &&
|
receive.denyCurrentBranch: respect all worktrees
The receive.denyCurrentBranch config option controls what happens if
you push to a branch that is checked out into a non-bare repository.
By default, it rejects it. It can be disabled via `ignore` or `warn`.
Another yet trickier option is `updateInstead`.
However, this setting was forgotten when the git worktree command was
introduced: only the main worktree's current branch is respected.
With this change, all worktrees are respected.
That change also leads to revealing another bug,
i.e. `receive.denyCurrentBranch = true` was ignored when pushing into a
non-bare repository's unborn current branch using ref namespaces. As
`is_ref_checked_out()` returns 0 which means `receive-pack` does not get
into conditional statement to switch `deny_current_branch` accordingly
(ignore, warn, refuse, unconfigured, updateInstead).
receive.denyCurrentBranch uses the function `refs_resolve_ref_unsafe()`
(called via `resolve_refdup()`) to resolve the symbolic ref HEAD, but
that function fails when HEAD does not point at a valid commit.
As we replace the call to `refs_resolve_ref_unsafe()` with
`find_shared_symref()`, which has no problem finding the worktree for a
given branch even if it is unborn yet, this bug is fixed at the same
time: receive.denyCurrentBranch now also handles worktrees with unborn
branches as intended even while using ref namespaces.
Helped-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Hariom Verma <hariom18599@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-02-23 18:57:10 +00:00
|
|
|
test_must_fail git -C cloned push --delete origin new-wt
|
|
|
|
'
|
2021-12-01 22:15:44 +00:00
|
|
|
|
2021-12-01 22:15:46 +00:00
|
|
|
test_expect_success 'denyCurrentBranch and bare repository worktrees' '
|
|
|
|
test_when_finished "rm -fr bare.git" &&
|
|
|
|
git clone --bare . bare.git &&
|
|
|
|
git -C bare.git worktree add wt &&
|
|
|
|
test_commit grape &&
|
|
|
|
git -C bare.git config receive.denyCurrentBranch refuse &&
|
|
|
|
test_must_fail git push bare.git HEAD:wt &&
|
|
|
|
git -C bare.git config receive.denyCurrentBranch updateInstead &&
|
|
|
|
git push bare.git HEAD:wt &&
|
|
|
|
test_path_exists bare.git/wt/grape.t &&
|
|
|
|
test_must_fail git push --delete bare.git wt
|
|
|
|
'
|
|
|
|
|
2021-12-01 22:15:44 +00:00
|
|
|
test_expect_success 'refuse fetch to current branch of worktree' '
|
|
|
|
test_when_finished "git worktree remove --force wt && git branch -D wt" &&
|
|
|
|
git worktree add wt &&
|
|
|
|
test_commit apple &&
|
|
|
|
test_must_fail git fetch . HEAD:wt &&
|
|
|
|
git fetch -u . HEAD:wt
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'refuse fetch to current branch of bare repository worktree' '
|
|
|
|
test_when_finished "rm -fr bare.git" &&
|
|
|
|
git clone --bare . bare.git &&
|
|
|
|
git -C bare.git worktree add wt &&
|
|
|
|
test_commit banana &&
|
|
|
|
test_must_fail git -C bare.git fetch .. HEAD:wt &&
|
|
|
|
git -C bare.git fetch -u .. HEAD:wt
|
|
|
|
'
|
|
|
|
|
2022-01-29 06:35:38 +00:00
|
|
|
test_expect_success 'refuse to push a hidden ref, and make sure do not pollute the repository' '
|
|
|
|
mk_empty testrepo &&
|
|
|
|
git -C testrepo config receive.hiderefs refs/hidden &&
|
|
|
|
git -C testrepo config receive.unpackLimit 1 &&
|
|
|
|
test_must_fail git push testrepo HEAD:refs/hidden/foo &&
|
|
|
|
test_dir_is_empty testrepo/.git/objects/pack
|
|
|
|
'
|
|
|
|
|
2022-06-17 19:06:19 +00:00
|
|
|
test_expect_success 'push with config push.useBitmaps' '
|
|
|
|
mk_test testrepo heads/main &&
|
|
|
|
git checkout main &&
|
|
|
|
test_unconfig push.useBitmaps &&
|
|
|
|
GIT_TRACE2_EVENT="$PWD/default" \
|
2022-11-21 13:40:40 +00:00
|
|
|
git push --quiet testrepo main:test &&
|
2022-06-17 19:06:19 +00:00
|
|
|
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" \
|
2022-11-21 13:40:40 +00:00
|
|
|
git push --quiet testrepo main:test2 &&
|
2022-06-17 19:06:19 +00:00
|
|
|
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" \
|
2022-11-21 13:40:40 +00:00
|
|
|
git push --quiet testrepo main:test3 &&
|
2022-06-17 19:06:19 +00:00
|
|
|
test_subcommand git pack-objects --all-progress-implied --revs --stdout \
|
|
|
|
--thin --delta-base-offset -q --no-use-bitmap-index <false
|
|
|
|
'
|
|
|
|
|
2007-06-08 07:43:22 +00:00
|
|
|
test_done
|