From f3818d22239a5737ba26f0773963dfdcadb6722c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Wed, 7 Dec 2022 12:48:53 +0100 Subject: [PATCH] Aggregate git errors too --- common/lib/dependabot/file_updaters/vendor_updater.rb | 3 ++- common/lib/dependabot/shared_helpers.rb | 3 ++- github_actions/lib/dependabot/github_actions/update_checker.rb | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/common/lib/dependabot/file_updaters/vendor_updater.rb b/common/lib/dependabot/file_updaters/vendor_updater.rb index b108940371..a8fc743316 100644 --- a/common/lib/dependabot/file_updaters/vendor_updater.rb +++ b/common/lib/dependabot/file_updaters/vendor_updater.rb @@ -23,7 +23,8 @@ def updated_vendor_cache_files(base_directory:) # rubocop:enable Performance/DeletePrefix status = SharedHelpers.run_shell_command( - "git status --untracked-files all --porcelain v1 #{relative_dir}" + "git status --untracked-files all --porcelain v1 #{relative_dir}", + fingerprint: "git status --untracked-files all --porcelain v1 " ) changed_paths = status.split("\n").map(&:split) changed_paths.map do |type, path| diff --git a/common/lib/dependabot/shared_helpers.rb b/common/lib/dependabot/shared_helpers.rb index 0537e0de08..d1c027749f 100644 --- a/common/lib/dependabot/shared_helpers.rb +++ b/common/lib/dependabot/shared_helpers.rb @@ -190,7 +190,8 @@ def self.configure_git_to_use_https_with_credentials(credentials, safe_directori run_shell_command( "git config --global credential.helper " \ "'!#{credential_helper_path} --file #{Dir.pwd}/git.store'", - allow_unsafe_shell_command: true + allow_unsafe_shell_command: true, + fingerprint: "git config --global credential.helper ''" ) # see https://github.blog/2022-04-12-git-security-vulnerability-announced/ diff --git a/github_actions/lib/dependabot/github_actions/update_checker.rb b/github_actions/lib/dependabot/github_actions/update_checker.rb index b1d0c098b7..722587f393 100644 --- a/github_actions/lib/dependabot/github_actions/update_checker.rb +++ b/github_actions/lib/dependabot/github_actions/update_checker.rb @@ -252,7 +252,8 @@ def shortened_semver_eq?(base, other) def find_container_branch(sha) branches_including_ref = SharedHelpers.run_shell_command( - "git branch --remotes --contains #{sha}" + "git branch --remotes --contains #{sha}", + fingerprint: "git branch --remotes --contains " ).split("\n").map { |branch| branch.strip.gsub("origin/", "") } current_branch = branches_including_ref.find { |branch| branch.start_with?("HEAD -> ") }