DEV: Fix a spec incompatibility with pre-2.28 git (#10892)

Regression introduced in 6932a373a3
This commit is contained in:
Jarek Radosz 2020-10-12 19:59:54 +02:00 committed by GitHub
parent 6932a373a3
commit 572da7a57b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -106,7 +106,7 @@ describe Discourse::VERSION do
# Simulate a remote upstream
`cd #{path} && git remote add origin #{path}/.git && git fetch -q`
`cd #{path} && git branch -u origin/main`
`cd #{path} && git branch -u origin/$(git branch --show-current)`
end
path

View File

@ -165,7 +165,7 @@ module Helpers
def setup_git_repo(files)
repo_dir = Dir.mktmpdir
`cd #{repo_dir} && git init . --initial-branch=main`
`cd #{repo_dir} && git init .`
`cd #{repo_dir} && git config user.email 'someone@cool.com'`
`cd #{repo_dir} && git config user.name 'The Cool One'`
`cd #{repo_dir} && git config commit.gpgsign 'false'`