DEV: Fix an apparently "too modern" git command (#10894)

A follow-up to a follow-up. (6932a373a34a7150f8514af7edaf9048cc719a7d and 572da7a57b7ec672fcde673a5d7ac4ce555f249d)
Our `discourse_test` Docker image uses git 2.20.1 released on Dec 15, 2018. It does not support `git branch --show-current`. (it was added in 2.22.0)
This commit is contained in:
Jarek Radosz
2020-10-12 22:54:56 +02:00
committed by GitHub
parent a361f86c62
commit acf5a26058

View File

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