admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

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

Browse Source
This commit is contained in:
Bo Anderson 2021-02-10 17:35:25 +00:00
parent e0a9ec9b1e
commit f5c075d668
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Library/Homebrew/test/utils/git_spec.rb
View File

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