diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-07-18 23:31:55 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-07-18 23:31:55 +0300 |
| commit | 3d3874d537af1149c85b73d7c4317ed1b0d0b419 (patch) | |
| tree | 577fde64cf3c19bd7a39bc526a02d49b17113f49 /t/t5505-remote.sh | |
| parent | 48e88a4862f3f0353f7a795dae0346dca0043829 (diff) | |
| parent | ead74601c6ed7171e9e736e329b45c12d90153e4 (diff) | |
Merge branch 'ab/test-without-templates'
Tweak tests so that they still work when the "git init" template
did not create .git/info directory.
* ab/test-without-templates:
tests: don't assume a .git/info for .git/info/sparse-checkout
tests: don't assume a .git/info for .git/info/exclude
tests: don't assume a .git/info for .git/info/refs
tests: don't assume a .git/info for .git/info/attributes
tests: don't assume a .git/info for .git/info/grafts
tests: don't depend on template-created .git/branches
t0008: don't rely on default ".git/info/exclude"
Diffstat (limited to 't/t5505-remote.sh')
| -rwxr-xr-x | t/t5505-remote.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh index 0aad0eb4d2..6c7370f87f 100755 --- a/t/t5505-remote.sh +++ b/t/t5505-remote.sh @@ -1003,11 +1003,12 @@ test_expect_success 'migrate a remote from named file in $GIT_DIR/remotes' ' ' test_expect_success 'migrate a remote from named file in $GIT_DIR/branches' ' - git clone one six && + git clone --template= one six && origin_url=$(pwd)/one && ( cd six && git remote rm origin && + mkdir .git/branches && echo "$origin_url#main" >.git/branches/origin && git remote rename origin origin && test_path_is_missing .git/branches/origin && @@ -1018,10 +1019,11 @@ test_expect_success 'migrate a remote from named file in $GIT_DIR/branches' ' ' test_expect_success 'migrate a remote from named file in $GIT_DIR/branches (2)' ' - git clone one seven && + git clone --template= one seven && ( cd seven && git remote rm origin && + mkdir .git/branches && echo "quux#foom" > .git/branches/origin && git remote rename origin origin && test_path_is_missing .git/branches/origin && |