kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Use a fixed git abbrev parameter when we fetch a git revision

Browse source
This commit is contained in:
Valery Sizov 2019-03-28 13:05:03 +02:00
parent 04496085c1
commit cc2e849afd
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
changelogs/unreleased/10735-geo-gitlab-revision-can-return-not-consistent-results.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Use a fixed git abbrev parameter when we fetch a git revision
merge_request: 26707
author:
type: fixed

2
lib/gitlab.rb
View file

@ -24,7 +24,7 @@ module Gitlab
if File.exist?(root.join("REVISION"))
File.read(root.join("REVISION")).strip.freeze
else
result = Gitlab::Popen.popen_with_detail(%W[#{config.git.bin_path} log --pretty=format:%h -n 1])
result = Gitlab::Popen.popen_with_detail(%W[#{config.git.bin_path} log --pretty=format:%h --abbrev=11 -n 1])
if result.status.success?
result.stdout.chomp.freeze

2
spec/lib/gitlab_spec.rb
View file

@ -10,7 +10,7 @@ describe Gitlab do
end
describe '.revision' do
let(:cmd) { %W[#{described_class.config.git.bin_path} log --pretty=format:%h -n 1] }
let(:cmd) { %W[#{described_class.config.git.bin_path} log --pretty=format:%h --abbrev=11 -n 1] }
around do |example|
described_class.instance_variable_set(:@_revision, nil)