From b0efdc89bb2b716e08587c196d81acaf8884bd7b Mon Sep 17 00:00:00 2001 From: Gregory Noma Date: Fri, 28 Jan 2022 14:12:28 +0000 Subject: SERVER-49230 Upgrade Zstandard to 1.5.1 --- evergreen/feature_flag_tags_check.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'evergreen') diff --git a/evergreen/feature_flag_tags_check.sh b/evergreen/feature_flag_tags_check.sh index a253195543b..5b046843a76 100755 --- a/evergreen/feature_flag_tags_check.sh +++ b/evergreen/feature_flag_tags_check.sh @@ -16,14 +16,14 @@ $python buildscripts/idl/gen_all_feature_flag_list.py --import-dir src --import- mv all_feature_flags.txt patch_all_feature_flags.txt # get the list of feature flags from the base commit -git --no-pager diff "$(git merge-base origin/${branch_name} HEAD)" --output="$diff_file_name" +git --no-pager diff "$(git merge-base origin/${branch_name} HEAD)" --output="$diff_file_name" --binary if [ -s "$diff_file_name" ]; then git apply -R "$diff_file_name" fi # This script has to be run on an Evergreen variant or local repo with the enterprise module. pushd "$enterprise_path" -git --no-pager diff "$(git merge-base origin/${branch_name} HEAD)" --output="$diff_file_name" +git --no-pager diff "$(git merge-base origin/${branch_name} HEAD)" --output="$diff_file_name" --binary if [ -s "$diff_file_name" ]; then git apply -R "$diff_file_name" fi -- cgit v1.2.1