diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-03-29 12:44:35 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-03-29 12:44:35 +0300 |
| commit | 7ae35d0a78535218c7e01b917dccc1cea766707b (patch) | |
| tree | 24912e8206419e08b7d5e12568f3d942cfc9ba9b /lib | |
| parent | c395ef1d6e9e78833443c3410ec55bd041840f14 (diff) | |
| parent | cc2e849afd1a2b7c5c0ad1dcb5b675d072800b8b (diff) | |
Merge branch '10735-geo-gitlab-revision-can-return-not-consistent-results' into 'master'
Use a fixed git abbrev parameter when we fetch a git revision
See merge request gitlab-org/gitlab-ce!26707
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab.rb b/lib/gitlab.rb index f42ca5a9cd6..1204e53ee2e 100644 --- a/lib/gitlab.rb +++ b/lib/gitlab.rb @@ -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 |