Merge pull request #10588 from Bo98/git-test-fix

test/utils/git_spec: fix cherry pick test with older git
This commit is contained in:
Bo Anderson 2021-02-11 17:41:10 +00:00 committed by GitHub
commit 7d91406b88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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/)