# HG changeset patch # User Balasankar 'Balu' C <balasankar@gitlab.com> # Date 1675963290 0 # Thu Feb 09 17:21:30 2023 +0000 # Node ID 97d35ad3c79134c0da38d49fb040c8eaf75c400d # Parent d18e514d84a802d6c28c3df5c24745592b301984 Fix build time ENV calculation for git - The git build config only selects ENV for specific build times and the method `start_with?` was invoked but without the trailing `?`. This adds the `?` so the entire check will work correctly. Related https://gitlab.com/gitlab-org/release/tasks/-/issues/5038 Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com> diff --git a/config/software/git.rb b/config/software/git.rb --- a/config/software/git.rb +++ b/config/software/git.rb @@ -84,7 +84,7 @@ # # As the bundled Git versions change over time we have this generic loop to # just accept any such override into the environment used by make. - ENV.select { |k, v| k.start_with('GITALY_GIT_VERSION_') }.each do |k, v| + ENV.select { |k, v| k.start_with?('GITALY_GIT_VERSION_') }.each do |k, v| env[k.delete_prefix('GITALY_')] = v unless v&.empty? end