f137f45388
It's very common for a user to specify an SSH remote that refers to an alias in their gitconfig file. For example, if a user must use different SSH keys when pushing to different remotes, setting different aliases that use those different keys is the simplest and easiest way to accomplish that goal. Unfortunately, our parsing logic was broken for SSH remotes that used bare SSH URLs (that is, without “ssh://”) with a hostname or alias, but without a username component. The URL parser we used saw the hostname portion as the scheme of a URL, and we passed through any URLs with unknown schemes. This led to a failure to push, since we misparsed the URL as a non-SSH URL and gave up when it also didn't look like an HTTP(S) URL. If we get an unknown “scheme” when parsing a URL, check if the URL uses a remote helper (that is, it contains a double colon), and pass it through. Otherwise, do what Git does, and assume the URL is in fact an SSH URL, and handle it accordingly. We already handle the url.insteadof syntax properly, even if it looks like a scheme. Add tests that we continue to do so, and for the new code and all the various permutations mentioned above, and update the existing integration test to reflect our new parsing strategy.
161 lines
4.1 KiB
Bash
Executable File
161 lines
4.1 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
|
|
. "$(dirname "$0")/testlib.sh"
|
|
|
|
begin_test "default config"
|
|
(
|
|
set -e
|
|
reponame="default-config"
|
|
mkdir $reponame
|
|
cd $reponame
|
|
git init
|
|
git remote add origin "$GITSERVER/$reponame"
|
|
git lfs env | tee env.log
|
|
grep "Endpoint=$GITSERVER/$reponame.git/info/lfs (auth=none)" env.log
|
|
|
|
git config --file=.gitconfig lfs.url http://gitconfig-file-ignored
|
|
git config --file=.lfsconfig lfs.url http://lfsconfig-file
|
|
git config --file=.lfsconfig lfs.http://lfsconfig-file.access lfsconfig
|
|
git lfs env | tee env.log
|
|
grep "Endpoint=http://lfsconfig-file (auth=lfsconfig)" env.log
|
|
|
|
git config --file=.lfsconfig --unset lfs.url
|
|
git config --file=.lfsconfig --unset lfs.http://lfsconfig-file.access
|
|
|
|
# new endpoint url from local git config
|
|
# access setting no longer applied
|
|
git config lfs.url http://local-lfsconfig
|
|
git lfs env | tee env.log
|
|
grep "Endpoint=http://local-lfsconfig (auth=none)" env.log
|
|
|
|
# add the access setting to lfsconfig
|
|
git config --file=.lfsconfig lfs.http://local-lfsconfig.access lfsconfig
|
|
git lfs env | tee env.log
|
|
grep "Endpoint=http://local-lfsconfig (auth=lfsconfig)" env.log
|
|
|
|
git config --file=.lfsconfig --unset lfs.http://local-lfsconfig.access
|
|
|
|
# add the access setting to git config
|
|
git config lfs.http://local-lfsconfig.access gitconfig
|
|
git lfs env | tee env.log
|
|
grep "Endpoint=http://local-lfsconfig (auth=gitconfig)" env.log
|
|
)
|
|
end_test
|
|
|
|
begin_test "extension config"
|
|
(
|
|
set -e
|
|
|
|
git config --global lfs.extension.env-test.clean "env-test-clean"
|
|
git config --global lfs.extension.env-test.smudge "env-test-smudge"
|
|
git config --global lfs.extension.env-test.priority 0
|
|
|
|
reponame="extension-config"
|
|
mkdir $reponame
|
|
cd $reponame
|
|
git init
|
|
|
|
expected0="Extension: env-test
|
|
clean = env-test-clean
|
|
smudge = env-test-smudge
|
|
priority = 0"
|
|
|
|
[ "$expected0" = "$(git lfs ext)" ]
|
|
|
|
# any git config takes precedence over .lfsconfig
|
|
git config --global --unset lfs.extension.env-test.priority
|
|
|
|
git config --file=.lfsconfig lfs.extension.env-test.clean "file-env-test-clean"
|
|
git config --file=.lfsconfig lfs.extension.env-test.smudge "file-env-test-smudge"
|
|
git config --file=.lfsconfig lfs.extension.env-test.priority 1
|
|
cat .lfsconfig
|
|
expected1="Extension: env-test
|
|
clean = env-test-clean
|
|
smudge = env-test-smudge
|
|
priority = 1"
|
|
|
|
[ "$expected1" = "$(GIT_TRACE=5 git lfs ext)" ]
|
|
|
|
git config lfs.extension.env-test.clean "local-env-test-clean"
|
|
git config lfs.extension.env-test.smudge "local-env-test-smudge"
|
|
git config lfs.extension.env-test.priority 2
|
|
expected2="Extension: env-test
|
|
clean = local-env-test-clean
|
|
smudge = local-env-test-smudge
|
|
priority = 2"
|
|
|
|
[ "$expected2" = "$(git lfs ext)" ]
|
|
)
|
|
end_test
|
|
|
|
begin_test "url alias config"
|
|
(
|
|
set -e
|
|
|
|
mkdir url-alias
|
|
cd url-alias
|
|
|
|
git init
|
|
|
|
# When more than one insteadOf strings match a given URL, the longest match is used.
|
|
git config url."http://wrong-url/".insteadOf alias
|
|
git config url."http://actual-url/".insteadOf alias:
|
|
git config lfs.url alias:rest
|
|
git lfs env | tee env.log
|
|
grep "Endpoint=http://actual-url/rest (auth=none)" env.log
|
|
)
|
|
end_test
|
|
|
|
begin_test "ambiguous url alias"
|
|
(
|
|
set -e
|
|
|
|
mkdir url-alias-ambiguous
|
|
cd url-alias-ambiguous
|
|
|
|
git init
|
|
|
|
git config url."http://actual-url/".insteadOf alias:
|
|
git config url."http://dupe-url".insteadOf alias:
|
|
git config lfs.url alias:rest
|
|
git config -l | grep url
|
|
|
|
git lfs env 2>&1 | tee env2.log
|
|
grep "WARNING: Multiple 'url.*.insteadof'" env2.log
|
|
)
|
|
end_test
|
|
|
|
begin_test "url alias must be prefix"
|
|
(
|
|
set -e
|
|
|
|
mkdir url-alias-bad
|
|
cd url-alias-bad
|
|
|
|
git init
|
|
|
|
git config url."http://actual-url/".insteadOf alias:
|
|
git config lfs.url badalias:rest
|
|
git lfs env | tee env.log
|
|
grep "SSH=badalias:rest" env.log
|
|
)
|
|
end_test
|
|
|
|
begin_test "config: ignoring unsafe lfsconfig keys"
|
|
(
|
|
set -e
|
|
|
|
reponame="config-unsafe-lfsconfig-keys"
|
|
git init "$reponame"
|
|
cd "$reponame"
|
|
|
|
# Insert an 'unsafe' key into this repository's '.lfsconfig'.
|
|
git config --file=.lfsconfig core.askpass unsafe
|
|
|
|
git lfs env 2>&1 | tee status.log
|
|
|
|
grep "WARNING: These unsafe lfsconfig keys were ignored:" status.log
|
|
grep " core.askpass" status.log
|
|
)
|
|
end_test
|