diff options
| author | Gregory Noma <gregory.noma@gmail.com> | 2022-01-28 14:12:28 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-01-28 14:52:52 +0000 |
| commit | b0efdc89bb2b716e08587c196d81acaf8884bd7b (patch) | |
| tree | fe065c3c82e1fecc36db30111a0bc64fad63c102 /evergreen/feature_flag_tags_check.sh | |
| parent | edceb0c5e345f15f660776ded34b3f5e3245533d (diff) | |
| download | mongo-b0efdc89bb2b716e08587c196d81acaf8884bd7b.tar.gz | |
SERVER-49230 Upgrade Zstandard to 1.5.1
Diffstat (limited to 'evergreen/feature_flag_tags_check.sh')
| -rwxr-xr-x | evergreen/feature_flag_tags_check.sh | 4 |
1 files changed, 2 insertions, 2 deletions
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 |