bfa9148ff7
Change "git remote add" so that it adds a *.tagOpt key, and not the lower-cased *.tagopt on "git remote add --no-tags", just as "git clone --no-tags" would do. This doesn't matter for anything that reads the config. It's just prettier if we write config keys in their documented camelCase form to user-readable config files. When I added support for "clone -no-tags" in0dab2468ee(clone: add a --no-tags option to clone without tags, 2017-04-26) I made it use the *.tagOpt form, but the older "git remote add" added in111fb85865(remote add: add a --[no-]tags option, 2010-04-20) has been using *.tagopt all this time. It's easy enough to add a test for this, so let's do that. We can't use "git config -l" there, because it'll normalize the keys to their lower-cased form. Let's add the test for "git clone" too for good measure, not just to the "git remote" codepath we're fixing. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
236 lines
5.6 KiB
Bash
Executable File
236 lines
5.6 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='test refspec written by clone-command'
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup' '
|
|
# Make two branches, "master" and "side"
|
|
echo one >file &&
|
|
git add file &&
|
|
git commit -m one &&
|
|
echo two >file &&
|
|
git commit -a -m two &&
|
|
git tag two &&
|
|
echo three >file &&
|
|
git commit -a -m three &&
|
|
git checkout -b side &&
|
|
echo four >file &&
|
|
git commit -a -m four &&
|
|
git checkout master &&
|
|
git tag five &&
|
|
|
|
# default clone
|
|
git clone . dir_all &&
|
|
|
|
# default clone --no-tags
|
|
git clone --no-tags . dir_all_no_tags &&
|
|
|
|
# default --single that follows HEAD=master
|
|
git clone --single-branch . dir_master &&
|
|
|
|
# default --single that follows HEAD=master with no tags
|
|
git clone --single-branch --no-tags . dir_master_no_tags &&
|
|
|
|
# default --single that follows HEAD=side
|
|
git checkout side &&
|
|
git clone --single-branch . dir_side &&
|
|
|
|
# explicit --single that follows side
|
|
git checkout master &&
|
|
git clone --single-branch --branch side . dir_side2 &&
|
|
|
|
# default --single with --mirror
|
|
git clone --single-branch --mirror . dir_mirror &&
|
|
|
|
# default --single with --branch and --mirror
|
|
git clone --single-branch --mirror --branch side . dir_mirror_side &&
|
|
|
|
# --single that does not know what branch to follow
|
|
git checkout two^ &&
|
|
git clone --single-branch . dir_detached &&
|
|
|
|
# explicit --single with tag
|
|
git clone --single-branch --branch two . dir_tag &&
|
|
|
|
# explicit --single with tag and --no-tags
|
|
git clone --single-branch --no-tags --branch two . dir_tag_no_tags &&
|
|
|
|
# advance both "master" and "side" branches
|
|
git checkout side &&
|
|
echo five >file &&
|
|
git commit -a -m five &&
|
|
git checkout master &&
|
|
echo six >file &&
|
|
git commit -a -m six &&
|
|
|
|
# update tag
|
|
git tag -d two && git tag two
|
|
'
|
|
|
|
test_expect_success 'by default all branches will be kept updated' '
|
|
(
|
|
cd dir_all &&
|
|
git fetch &&
|
|
git for-each-ref refs/remotes/origin >refs &&
|
|
sed -e "/HEAD$/d" \
|
|
-e "s|/remotes/origin/|/heads/|" refs >../actual
|
|
) &&
|
|
# follow both master and side
|
|
git for-each-ref refs/heads >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'by default no tags will be kept updated' '
|
|
(
|
|
cd dir_all &&
|
|
git fetch &&
|
|
git for-each-ref refs/tags >../actual
|
|
) &&
|
|
git for-each-ref refs/tags >expect &&
|
|
! test_cmp expect actual &&
|
|
test_line_count = 2 actual
|
|
'
|
|
|
|
test_expect_success 'clone with --no-tags' '
|
|
(
|
|
cd dir_all_no_tags &&
|
|
grep tagOpt .git/config &&
|
|
git fetch &&
|
|
git for-each-ref refs/tags >../actual
|
|
) &&
|
|
test_must_be_empty actual
|
|
'
|
|
|
|
test_expect_success '--single-branch while HEAD pointing at master' '
|
|
(
|
|
cd dir_master &&
|
|
git fetch --force &&
|
|
git for-each-ref refs/remotes/origin >refs &&
|
|
sed -e "/HEAD$/d" \
|
|
-e "s|/remotes/origin/|/heads/|" refs >../actual
|
|
) &&
|
|
# only follow master
|
|
git for-each-ref refs/heads/master >expect &&
|
|
# get & check latest tags
|
|
test_cmp expect actual &&
|
|
(
|
|
cd dir_master &&
|
|
git fetch --tags --force &&
|
|
git for-each-ref refs/tags >../actual
|
|
) &&
|
|
git for-each-ref refs/tags >expect &&
|
|
test_cmp expect actual &&
|
|
test_line_count = 2 actual
|
|
'
|
|
|
|
test_expect_success '--single-branch while HEAD pointing at master and --no-tags' '
|
|
(
|
|
cd dir_master_no_tags &&
|
|
git fetch &&
|
|
git for-each-ref refs/remotes/origin >refs &&
|
|
sed -e "/HEAD$/d" \
|
|
-e "s|/remotes/origin/|/heads/|" refs >../actual
|
|
) &&
|
|
# only follow master
|
|
git for-each-ref refs/heads/master >expect &&
|
|
test_cmp expect actual &&
|
|
# get tags (noop)
|
|
(
|
|
cd dir_master_no_tags &&
|
|
git fetch &&
|
|
git for-each-ref refs/tags >../actual
|
|
) &&
|
|
test_must_be_empty actual &&
|
|
test_line_count = 0 actual &&
|
|
# get tags with --tags overrides tagOpt
|
|
(
|
|
cd dir_master_no_tags &&
|
|
git fetch --tags &&
|
|
git for-each-ref refs/tags >../actual
|
|
) &&
|
|
git for-each-ref refs/tags >expect &&
|
|
test_cmp expect actual &&
|
|
test_line_count = 2 actual
|
|
'
|
|
|
|
test_expect_success '--single-branch while HEAD pointing at side' '
|
|
(
|
|
cd dir_side &&
|
|
git fetch &&
|
|
git for-each-ref refs/remotes/origin >refs &&
|
|
sed -e "/HEAD$/d" \
|
|
-e "s|/remotes/origin/|/heads/|" refs >../actual
|
|
) &&
|
|
# only follow side
|
|
git for-each-ref refs/heads/side >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success '--single-branch with explicit --branch side' '
|
|
(
|
|
cd dir_side2 &&
|
|
git fetch &&
|
|
git for-each-ref refs/remotes/origin >refs &&
|
|
sed -e "/HEAD$/d" \
|
|
-e "s|/remotes/origin/|/heads/|" refs >../actual
|
|
) &&
|
|
# only follow side
|
|
git for-each-ref refs/heads/side >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success '--single-branch with explicit --branch with tag fetches updated tag' '
|
|
(
|
|
cd dir_tag &&
|
|
git fetch &&
|
|
git for-each-ref refs/tags >../actual
|
|
) &&
|
|
git for-each-ref refs/tags >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success '--single-branch with explicit --branch with tag fetches updated tag despite --no-tags' '
|
|
(
|
|
cd dir_tag_no_tags &&
|
|
git fetch &&
|
|
git for-each-ref refs/tags >../actual
|
|
) &&
|
|
git for-each-ref refs/tags/two >expect &&
|
|
test_cmp expect actual &&
|
|
test_line_count = 1 actual
|
|
'
|
|
|
|
test_expect_success '--single-branch with --mirror' '
|
|
(
|
|
cd dir_mirror &&
|
|
git fetch &&
|
|
git for-each-ref refs > ../actual
|
|
) &&
|
|
git for-each-ref refs >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success '--single-branch with explicit --branch and --mirror' '
|
|
(
|
|
cd dir_mirror_side &&
|
|
git fetch &&
|
|
git for-each-ref refs > ../actual
|
|
) &&
|
|
git for-each-ref refs >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success '--single-branch with detached' '
|
|
(
|
|
cd dir_detached &&
|
|
git fetch &&
|
|
git for-each-ref refs/remotes/origin >refs &&
|
|
sed -e "/HEAD$/d" \
|
|
-e "s|/remotes/origin/|/heads/|" refs >../actual
|
|
) &&
|
|
# nothing
|
|
test_must_be_empty actual
|
|
'
|
|
|
|
test_done
|