diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
commit | e8d2c2579383897a1dd7f9debd359abe8ae8373d (patch) | |
tree | c42be41678c2586d49a75cabce89322082698334 /lib/gitlab/git.rb | |
parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'lib/gitlab/git.rb')
-rw-r--r-- | lib/gitlab/git.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/git.rb b/lib/gitlab/git.rb index a2215366bdc..d5ced2045f5 100644 --- a/lib/gitlab/git.rb +++ b/lib/gitlab/git.rb @@ -80,7 +80,7 @@ module Gitlab def shas_eql?(sha1, sha2) return true if sha1.nil? && sha2.nil? return false if sha1.nil? || sha2.nil? - return false unless sha1.class == sha2.class + return false unless sha1.instance_of?(sha2.class) # If either of the shas is below the minimum length, we cannot be sure # that they actually refer to the same commit because of hash collision. |