mirror of
https://github.com/ruby/ruby.git
synced 2025-08-15 13:39:04 +02:00
[rubygems/rubygems] Support git 2.49
One error message that we parse is now slightly different.
758528791d
This commit is contained in:
parent
469a0a4a08
commit
a56c2fb375
1 changed files with 8 additions and 3 deletions
|
@ -162,7 +162,8 @@ module Bundler
|
|||
_, err, status = capture(command, nil)
|
||||
return extra_ref if status.success?
|
||||
|
||||
if err.include?("Could not find remote branch")
|
||||
if err.include?("Could not find remote branch") || # git up to 2.49
|
||||
err.include?("Remote branch #{branch_option} not found") # git 2.49 or higher
|
||||
raise MissingGitRevisionError.new(command_with_no_credentials, nil, explicit_ref, credential_filtered_uri)
|
||||
else
|
||||
raise GitCommandError.new(command_with_no_credentials, path, err)
|
||||
|
@ -231,7 +232,7 @@ module Bundler
|
|||
end
|
||||
|
||||
def not_pinned?
|
||||
branch || tag || ref.nil?
|
||||
branch_option || ref.nil?
|
||||
end
|
||||
|
||||
def pinned_to_full_sha?
|
||||
|
@ -389,7 +390,7 @@ module Bundler
|
|||
# anyways.
|
||||
return args if @revision
|
||||
|
||||
args += ["--branch", branch || tag] if branch || tag
|
||||
args += ["--branch", branch_option] if branch_option
|
||||
args
|
||||
end
|
||||
|
||||
|
@ -405,6 +406,10 @@ module Bundler
|
|||
extra_args
|
||||
end
|
||||
|
||||
def branch_option
|
||||
branch || tag
|
||||
end
|
||||
|
||||
def full_clone?
|
||||
depth.nil?
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue