diff options
| author | Jun Aruga <jaruga@redhat.com> | 2021-08-17 18:21:06 +0200 |
|---|---|---|
| committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2021-08-31 19:06:14 +0900 |
| commit | 71f6711351b89330f5445cef6f0a38618627ce66 (patch) | |
| tree | 6a98a735c87a63e1e096fc447e1929abeadb8702 /spec | |
| parent | 907fa88a76e6c5ea7c0610baaa8dfaf5d094e6b3 (diff) | |
[rubygems/rubygems] Fix some failing Bundler tests with old Git.
Use the `git branch --list` rather than the `git branch -l` for better
compatibility. Because the `git branch -l` is used to create a new branch in
Git version < 2.20.0.
https://github.com/rubygems/rubygems/commit/eac5be7d06
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/4789
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/bundler/support/builders.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/bundler/support/builders.rb b/spec/bundler/support/builders.rb index 25377d2ac2..10beba1288 100644 --- a/spec/bundler/support/builders.rb +++ b/spec/bundler/support/builders.rb @@ -554,7 +554,7 @@ module Spec raise "You can't specify `master` as the branch" if branch == "master" escaped_branch = Shellwords.shellescape(branch) - if @context.git("branch -l #{escaped_branch}", libpath).empty? + if @context.git("branch --list #{escaped_branch}", libpath).empty? @context.git("branch #{escaped_branch}", libpath) end |