test/utils/git_spec: fix cherry pick test with older git

2021-02-10 17:35:25 +00:00 · 2021-02-10 17:35:25 +00:00 · f5c075d668
commit f5c075d668
parent e0a9ec9b1e
1 changed files with 1 additions and 0 deletions
--- a/Library/Homebrew/test/utils/git_spec.rb
+++ b/Library/Homebrew/test/utils/git_spec.rb
@ -58,6 +58,7 @@ describe Utils::Git do
    end

    it "aborts when cherry picking an existing hash" do
+      ENV["GIT_MERGE_VERBOSITY"] = "5" # Consistent output across git versions
      expect {
        described_class.cherry_pick!(HOMEBREW_CACHE, file_hash1)
      }.to raise_error(ErrorDuringExecution, /Merge conflict in README.md/)