diff options
| author | Steven Drake <sdrake@xnet.co.nz> | 2010-02-26 17:00:21 +1300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-02-25 22:47:48 -0800 |
| commit | a94d305bf8043a7a0579037c7e52e632613410f7 (patch) | |
| tree | fe5fb24e4e0685344f834cbaf3c7bbc2a008ccd1 | |
| parent | b02a17f2b7d0d3f5899ffdd9709ded8cea8ae019 (diff) | |
| download | git-a94d305bf8043a7a0579037c7e52e632613410f7.tar.gz | |
t/t0001-init.sh: add test for 'init with init.templatedir set'
Requires a small change to wrap-for-bin.sh in order to work.
Signed-off-by: Steven Drake <sdrake@xnet.co.nz>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t0001-init.sh | 19 | ||||
| -rw-r--r-- | wrap-for-bin.sh | 3 |
2 files changed, 21 insertions, 1 deletions
diff --git a/t/t0001-init.sh b/t/t0001-init.sh index 5386504790..675773479a 100755 --- a/t/t0001-init.sh +++ b/t/t0001-init.sh @@ -167,6 +167,25 @@ test_expect_success 'init with --template (blank)' ' ! test -f template-blank/.git/info/exclude ' +test_expect_success 'init with init.templatedir set' ' + mkdir templatedir-source && + echo Content >templatedir-source/file && + ( + HOME="`pwd`" && + export HOME && + test_config="${HOME}/.gitconfig" && + git config -f "$test_config" init.templatedir "${HOME}/templatedir-source" && + mkdir templatedir-set && + cd templatedir-set && + unset GIT_CONFIG_NOGLOBAL && + unset GIT_TEMPLATE_DIR && + NO_SET_GIT_TEMPLATE_DIR=t && + export NO_SET_GIT_TEMPLATE_DIR && + git init + ) && + test_cmp templatedir-source/file templatedir-set/.git/file +' + test_expect_success 'init --bare/--shared overrides system/global config' ' ( HOME="`pwd`" && diff --git a/wrap-for-bin.sh b/wrap-for-bin.sh index c5075c9c61..aece782a85 100644 --- a/wrap-for-bin.sh +++ b/wrap-for-bin.sh @@ -7,7 +7,8 @@ # @@BUILD_DIR@@ and @@PROG@@. GIT_EXEC_PATH='@@BUILD_DIR@@' -GIT_TEMPLATE_DIR='@@BUILD_DIR@@/templates/blt' +test -z "$NO_SET_GIT_TEMPLATE_DIR" && + GIT_TEMPLATE_DIR='@@BUILD_DIR@@/templates/blt' GITPERLLIB='@@BUILD_DIR@@/perl/blib/lib' PATH='@@BUILD_DIR@@/bin-wrappers:'"$PATH" export GIT_EXEC_PATH GIT_TEMPLATE_DIR GITPERLLIB PATH |