ruby-changes:68317
From: David <ko1@a...>
Date: Sat, 9 Oct 2021 09:27:17 +0900 (JST)
Subject: [ruby-changes:68317] b857a87653 (master): [rubygems/rubygems] Keep different code in custom branch in dummy repo
https://git.ruby-lang.org/ruby.git/commit/?id=b857a87653 From b857a8765338b76afd00691be29bdffdcc92991a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@r...> Date: Fri, 8 Oct 2021 13:03:17 +0200 Subject: [rubygems/rubygems] Keep different code in custom branch in dummy repo This doesn't affect the outcome of the test, but it makes the `git commit` command inside `update_git` not fail because of not having anything to commit. https://github.com/rubygems/rubygems/commit/ad0160ed97 --- spec/bundler/install/gemfile/git_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/bundler/install/gemfile/git_spec.rb b/spec/bundler/install/gemfile/git_spec.rb index 5ea9eee878..df2650989f 100644 --- a/spec/bundler/install/gemfile/git_spec.rb +++ b/spec/bundler/install/gemfile/git_spec.rb @@ -232,7 +232,7 @@ RSpec.describe "bundle install with git sources" do https://github.com/ruby/ruby/blob/trunk/spec/bundler/install/gemfile/git_spec.rb#L232 # want to ensure we don't fallback to HEAD update_git "foo", :path => lib_path("foo-1.0"), :branch => "rando" do |s| - s.write("lib/foo.rb", "raise 'FAIL'") + s.write("lib/foo.rb", "raise 'FAIL_FROM_RANDO'") end install_gemfile <<-G @@ -268,7 +268,7 @@ RSpec.describe "bundle install with git sources" do https://github.com/ruby/ruby/blob/trunk/spec/bundler/install/gemfile/git_spec.rb#L268 # want to ensure we don't fallback to HEAD update_git "foo", :path => lib_path("foo-1.0"), :branch => "rando" do |s| - s.write("lib/foo.rb", "raise 'FAIL'") + s.write("lib/foo.rb", "raise 'FAIL_FROM_RANDO'") end install_gemfile <<-G -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/