summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2020-02-11 12:54:05 +0100
committerDavid Rodríguez <deivid.rodriguez@riseup.net>2020-02-19 21:05:45 +0100
commitc849737f9c7830dffe006c9a68905a24c0704f39 (patch)
treeedefc026738012bbf5fcbfb12e3e0c9b89bc5054
parente9e20b21f426eef0a8a49042d6d76ba7aa576085 (diff)
downloadbundler-ci/ruby_27.tar.gz
Avoid switching folders in one more placeci/ruby_27
-rw-r--r--lib/bundler/build_metadata.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/bundler/build_metadata.rb b/lib/bundler/build_metadata.rb
index 4dfad2f8d8..214308bcc0 100644
--- a/lib/bundler/build_metadata.rb
+++ b/lib/bundler/build_metadata.rb
@@ -29,15 +29,15 @@ module Bundler
# commit instance variable then we can't determine its commits SHA.
git_dir = File.join(File.expand_path("../../..", __FILE__), ".git")
if File.directory?(git_dir)
- return @git_commit_sha = Dir.chdir(git_dir) { `git rev-parse --short HEAD`.strip.freeze }
+ require "open3"
+ return @git_commit_sha = Open3.capture2e("git", "rev-parse", "--short", "HEAD", :chdir => git_dir)[0].strip.freeze
end
# If Bundler is a submodule in RubyGems, get the submodule commit
git_sub_dir = File.join(File.expand_path("../../../..", __FILE__), ".git")
if File.directory?(git_sub_dir)
- return @git_commit_sha = Dir.chdir(git_sub_dir) do
- `git ls-tree --abbrev=8 HEAD bundler`.split(/\s/).fetch(2, "").strip.freeze
- end
+ require "open3"
+ return @git_commit_sha = Open3.capture2e("git", "ls-tree", "--abbrev=8", "HEAD", "bundler", :chdir => git_sub_dir)[0].split(/\s/).fetch(2, "").strip.freeze
end
@git_commit_sha ||= "unknown"