From c2404728b623588aa89920ae435b48af0fef011e Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Thu, 22 Jun 2023 15:49:05 +0300 Subject: Add branch sub-option for git project vcs in bdep-new Also fix tests which failed if for the initial branch git-init defaults to the name other than 'master'. --- tests/ci.testscript | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/ci.testscript') diff --git a/tests/ci.testscript b/tests/ci.testscript index cff198b..d604aa7 100644 --- a/tests/ci.testscript +++ b/tests/ci.testscript @@ -20,7 +20,7 @@ end # Create the remote repository. # +mkdir --no-cleanup prj.git -+git -C prj.git init --bare --quiet &prj.git/*** ++git -C prj.git -c init.defaultBranch=master init --bare --quiet &prj.git/*** # Adjust the local repository and push it to the remote one. # @@ -53,7 +53,7 @@ test.arguments += --yes --repository "$repository" --server "$server" \ config_cxx = [cmdline] cc config.cxx=$quote($recall($cxx.path) $cxx.config.mode, true) -new += 2>! +new += --vcs git,branch=master 2>! init += $config_cxx -d prj 2>! &prj/**/bootstrap/*** windows = ($cxx.target.class == 'windows') @@ -663,7 +663,7 @@ windows = ($cxx.target.class == 'windows') # Create the remote repository. # +mkdir --no-cleanup prj.git - +git -C prj.git init --bare --quiet &prj.git/*** + +git -C prj.git -c init.defaultBranch=master init --bare --quiet &prj.git/*** # Create the local repository and push it to the remote one. # -- cgit v1.1