aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArne Zachlod <arne@nerdkeller.org>2021-11-10 14:47:55 +0100
committerPaul Spooren <mail@aparcar.org>2021-11-13 10:29:41 -1000
commitb5ab6d0bc577e81a77f39211883f6c0c4155b6ed (patch)
treed358f46b31561e63ff2a82ebbde6d78b5ff979ee
parent7bc18aa2846d5fc4c35bbdf5b3aae486eb485850 (diff)
downloadupstream-b5ab6d0bc577e81a77f39211883f6c0c4155b6ed.tar.gz
upstream-b5ab6d0bc577e81a77f39211883f6c0c4155b6ed.tar.bz2
upstream-b5ab6d0bc577e81a77f39211883f6c0c4155b6ed.zip
scripts/env: fix env for git conf init.defaultBranch not set to "master"
Since version 2.28, git has a config option init.defaultBranch to set the name of the first branch created with git init. The env script expects this name to be "master". This commit sets the initial branch name to "master" instead of using the git configured one. Signed-off-by: Arne Zachlod <arne@nerdkeller.org>
-rwxr-xr-xscripts/env2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/env b/scripts/env
index df8b486bfe..5987b4160f 100755
--- a/scripts/env
+++ b/scripts/env
@@ -61,7 +61,7 @@ env_init() {
mkdir -p "$ENVDIR" || error "Failed to create the environment directory"
cd "$ENVDIR" || error "Failed to switch to the environment directory"
[ -d .git ] || {
- git init &&
+ git init -b master &&
touch .config &&
mkdir files &&
git add . &&