diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-06-13 20:18:46 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-06-13 20:18:46 (GMT) |
| commit | cf3269fba816d9b216b8b0d6e95ca6a345158de5 (patch) | |
| tree | 9ce7316f6013088bd62ac092f8a5da6bb6767df8 /t | |
| parent | 86d2271f06382ceeb66e891eff87166d858270e1 (diff) | |
| parent | e1df7fe43f4e2e607ed24668e2942d45df8d2743 (diff) | |
| download | git-cf3269fba816d9b216b8b0d6e95ca6a345158de5.zip git-cf3269fba816d9b216b8b0d6e95ca6a345158de5.tar.gz git-cf3269fba816d9b216b8b0d6e95ca6a345158de5.tar.bz2 | |
Merge branch 'nd/init-relative-template-fix'
A relative pathname given to "git init --template=<path> <repo>"
ought to be relative to the directory "git init" gets invoked in,
but it instead was made relative to the repository, which has been
corrected.
* nd/init-relative-template-fix:
init: make --template path relative to $CWD
Diffstat (limited to 't')
| -rwxr-xr-x | t/t0001-init.sh | 2 | ||||
| -rwxr-xr-x | t/t1301-shared-repo.sh | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/t/t0001-init.sh b/t/t0001-init.sh index 77a224a..0276d14 100755 --- a/t/t0001-init.sh +++ b/t/t0001-init.sh @@ -175,7 +175,7 @@ test_expect_success 'reinit' ' test_expect_success 'init with --template' ' mkdir template-source && echo content >template-source/file && - git init --template=../template-source template-custom && + git init --template=template-source template-custom && test_cmp template-source/file template-custom/.git/file ' diff --git a/t/t1301-shared-repo.sh b/t/t1301-shared-repo.sh index dfece75..2dc853d 100755 --- a/t/t1301-shared-repo.sh +++ b/t/t1301-shared-repo.sh @@ -136,7 +136,7 @@ test_expect_success POSIXPERM 'forced modes' ' ( cd new && umask 002 && - git init --shared=0660 --template=../templates && + git init --shared=0660 --template=templates && >frotz && git add frotz && git commit -a -m initial && @@ -192,7 +192,7 @@ test_expect_success POSIXPERM 're-init respects core.sharedrepository (remote)' umask 0022 && git init --bare --shared=0666 child.git && test_path_is_missing child.git/foo && - git init --bare --template=../templates child.git && + git init --bare --template=templates child.git && echo "-rw-rw-rw-" >expect && test_modebits child.git/foo >actual && test_cmp expect actual @@ -203,7 +203,7 @@ test_expect_success POSIXPERM 'template can set core.sharedrepository' ' umask 0022 && git config core.sharedrepository 0666 && cp .git/config templates/config && - git init --bare --template=../templates child.git && + git init --bare --template=templates child.git && echo "-rw-rw-rw-" >expect && test_modebits child.git/HEAD >actual && test_cmp expect actual |