mirror of
https://github.com/git/git
synced 2024-11-05 18:59:29 +00:00
515be83382
The initial fetch during a clone doesn't transfer refs matching additional fetch refspecs given on the command line as configuration variables, e.g. '-c remote.origin.fetch=<refspec>'. This contradicts the documentation stating that configuration variables specified via 'git clone -c <key>=<value> ...' "take effect immediately after the repository is initialized, but before the remote history is fetched" and the given example specifically mentions "adding additional fetch refspecs to the origin remote". Furthermore, one-shot configuration variables specified via 'git -c <key>=<value> clone ...', though not written to the newly created repository's config file, live during the lifetime of the 'clone' command, including the initial fetch. All this implies that any fetch refspecs specified this way should already be taken into account during the initial fetch. The reason for this is that the initial fetch is not a fully fledged 'git fetch' but a bunch of direct calls into the fetch/transport machinery with clone's own refs-to-refspec matching logic, which bypasses parts of 'git fetch' processing configured fetch refspecs. This logic only considers a single default refspec, potentially influenced by options like '--single-branch' and '--mirror'. The configured refspecs are, however, already read and parsed properly when clone calls remote.c:remote_get(), but it never looks at the parsed refspecs in the resulting 'struct remote'. Modify clone to take the remote's configured fetch refspecs into account to retrieve all matching refs during the initial fetch. Note that we have to explicitly add the default fetch refspec to the remote's refspecs, because at that point the remote only includes the fetch refspecs specified on the command line. Add tests to check that refspecs given both via 'git clone -c ...' and 'git -c ... clone' retrieve all refs matching either the default or the additional refspecs, and that it works even when the user specifies an alternative remote name via '--origin=<name>'. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
115 lines
3.1 KiB
Bash
Executable file
115 lines
3.1 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='tests for git clone -c key=value'
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'clone -c sets config in cloned repo' '
|
|
rm -rf child &&
|
|
git clone -c core.foo=bar . child &&
|
|
echo bar >expect &&
|
|
git --git-dir=child/.git config core.foo >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'clone -c can set multi-keys' '
|
|
rm -rf child &&
|
|
git clone -c core.foo=bar -c core.foo=baz . child &&
|
|
{ echo bar; echo baz; } >expect &&
|
|
git --git-dir=child/.git config --get-all core.foo >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'clone -c can set multi-keys, including some empty' '
|
|
rm -rf child &&
|
|
git clone -c credential.helper= -c credential.helper=hi . child &&
|
|
printf "%s\n" "" hi >expect &&
|
|
git --git-dir=child/.git config --get-all credential.helper >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'clone -c without a value is boolean true' '
|
|
rm -rf child &&
|
|
git clone -c core.foo . child &&
|
|
echo true >expect &&
|
|
git --git-dir=child/.git config --bool core.foo >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'clone -c config is available during clone' '
|
|
echo content >file &&
|
|
git add file &&
|
|
git commit -m one &&
|
|
rm -rf child &&
|
|
git clone -c core.autocrlf . child &&
|
|
printf "content\\r\\n" >expect &&
|
|
test_cmp expect child/file
|
|
'
|
|
|
|
test_expect_success 'clone -c remote.origin.fetch=<refspec> works' '
|
|
rm -rf child &&
|
|
git update-ref refs/grab/it refs/heads/master &&
|
|
git update-ref refs/leave/out refs/heads/master &&
|
|
git clone -c "remote.origin.fetch=+refs/grab/*:refs/grab/*" . child &&
|
|
git -C child for-each-ref --format="%(refname)" >actual &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
refs/grab/it
|
|
refs/heads/master
|
|
refs/remotes/origin/HEAD
|
|
refs/remotes/origin/master
|
|
EOF
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'git -c remote.origin.fetch=<refspec> clone works' '
|
|
rm -rf child &&
|
|
git -c "remote.origin.fetch=+refs/grab/*:refs/grab/*" clone . child &&
|
|
git -C child for-each-ref --format="%(refname)" >actual &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
refs/grab/it
|
|
refs/heads/master
|
|
refs/remotes/origin/HEAD
|
|
refs/remotes/origin/master
|
|
EOF
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'clone -c remote.<remote>.fetch=<refspec> --origin=<name>' '
|
|
rm -rf child &&
|
|
git clone --origin=upstream \
|
|
-c "remote.upstream.fetch=+refs/grab/*:refs/grab/*" \
|
|
-c "remote.origin.fetch=+refs/leave/*:refs/leave/*" \
|
|
. child &&
|
|
git -C child for-each-ref --format="%(refname)" >actual &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
refs/grab/it
|
|
refs/heads/master
|
|
refs/remotes/upstream/HEAD
|
|
refs/remotes/upstream/master
|
|
EOF
|
|
test_cmp expect actual
|
|
'
|
|
|
|
# Tests for the hidden file attribute on windows
|
|
is_hidden () {
|
|
# Use the output of `attrib`, ignore the absolute path
|
|
case "$(attrib "$1")" in *H*?:*) return 0;; esac
|
|
return 1
|
|
}
|
|
|
|
test_expect_success MINGW 'clone -c core.hideDotFiles' '
|
|
test_commit attributes .gitattributes "" &&
|
|
rm -rf child &&
|
|
git clone -c core.hideDotFiles=false . child &&
|
|
! is_hidden child/.gitattributes &&
|
|
rm -rf child &&
|
|
git clone -c core.hideDotFiles=dotGitOnly . child &&
|
|
! is_hidden child/.gitattributes &&
|
|
rm -rf child &&
|
|
git clone -c core.hideDotFiles=true . child &&
|
|
is_hidden child/.gitattributes
|
|
'
|
|
|
|
test_done
|