diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-12-19 00:15:17 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-12-19 00:15:17 +0100 |
| commit | 772bdcd4296b259d52aafb0badd79872e9db3bb3 (patch) | |
| tree | dac15d162ac6aae28d0e3cfdd287d66767621c21 /t/test-lib-functions.sh | |
| parent | Merge https://github.com/prati0100/git-gui (diff) | |
| parent | init: provide useful advice about init.defaultBranch (diff) | |
| download | git-772bdcd4296b259d52aafb0badd79872e9db3bb3.tar.xz git-772bdcd4296b259d52aafb0badd79872e9db3bb3.zip | |
Merge branch 'js/init-defaultbranch-advice'
Our users are going to be trained to prepare for future change of
init.defaultBranch configuration variable.
* js/init-defaultbranch-advice:
init: provide useful advice about init.defaultBranch
get_default_branch_name(): prepare for showing some advice
branch -m: allow renaming a yet-unborn branch
init: document `init.defaultBranch` better
Diffstat (limited to 't/test-lib-functions.sh')
| -rw-r--r-- | t/test-lib-functions.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index eca4d311ef..999982fe4a 100644 --- a/t/test-lib-functions.sh +++ b/t/test-lib-functions.sh @@ -1202,7 +1202,9 @@ test_create_repo () { mkdir -p "$repo" ( cd "$repo" || error "Cannot setup test environment" - "${GIT_TEST_INSTALLED:-$GIT_EXEC_PATH}/git$X" init \ + "${GIT_TEST_INSTALLED:-$GIT_EXEC_PATH}/git$X" -c \ + init.defaultBranch="${GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME-master}" \ + init \ "--template=$GIT_BUILD_DIR/templates/blt/" >&3 2>&4 || error "cannot run git init -- have you built things yet?" mv .git/hooks .git/hooks-disabled |