Skip to main content

Browse the archive

Staging
v0.5.1
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision 297ca895a27a6bbdb7906371d533f72a12ad25b2 authored by Junio C Hamano on 20 January 2022, 23:25:38 UTC, committed by Junio C Hamano on 20 January 2022, 23:25:38 UTC 
Merge branch 'js/branch-track-inherit'
 
"git branch -h" incorrectly said "--track[=direct|inherit]",
implying that "--trackinherit" is a valid option, which has been
corrected.
source: <3de40324bea6a1dd9bca2654721471e3809e87d8.1642538935.git.steadmon@google.com>
source: <c3c26192-aee9-185a-e559-b8735139e49c@web.de>

* js/branch-track-inherit:
  branch,checkout: fix --track documentation
2 parent s 50b2d72 + 6327f0e
Raw File
Tip revision: 297ca895a27a6bbdb7906371d533f72a12ad25b2 authored by Junio C Hamano on 20 January 2022, 23:25:38 UTC
Merge branch 'js/branch-track-inherit'
Tip revision: 297ca89
t5812-proto-disable-http.sh 
#!/bin/sh

test_description='test disabling of git-over-http in clone/fetch'
. ./test-lib.sh
. "$TEST_DIRECTORY/lib-proto-disable.sh"
. "$TEST_DIRECTORY/lib-httpd.sh"
start_httpd

test_expect_success 'create git-accessible repo' '
	bare="$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
	test_commit one &&
	git --bare init "$bare" &&
	git push "$bare" HEAD &&
	git -C "$bare" config http.receivepack true
'

test_proto "smart http" http "$HTTPD_URL/smart/repo.git"

test_expect_success 'curl redirects respect whitelist' '
	test_must_fail env GIT_ALLOW_PROTOCOL=http:https \
			   GIT_SMART_HTTP=0 \
		git clone "$HTTPD_URL/ftp-redir/repo.git" 2>stderr &&
	test_i18ngrep -E "(ftp.*disabled|your curl version is too old)" stderr
'

test_expect_success 'curl limits redirects' '
	test_must_fail git clone "$HTTPD_URL/loop-redir/smart/repo.git"
'

test_expect_success 'http can be limited to from-user' '
	git -c protocol.http.allow=user \
		clone "$HTTPD_URL/smart/repo.git" plain.git &&
	test_must_fail git -c protocol.http.allow=user \
		clone "$HTTPD_URL/smart-redir-perm/repo.git" redir.git
'

test_done
back to top