songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5252 from sloriot/Scripts-merge_check_update 

Update merge test script to workaround
This commit is contained in:
Laurent Rineau 2020-12-07 15:46:29 +01:00 committed by GitHub
parent a97f24a371 fd591dedf4
commit 373bb84118
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Scripts/developer_scripts/test_merge_of_branch
View File

@ -155,7 +155,7 @@ fi
#check no file contains non-utf8 characters #check no file contains non-utf8 characters
echo '.. Checking if non utf-8 characters are used...' echo '.. Checking if non utf-8 characters are used...'
txt_not_utf8=$(git ls-files -z --stage | awk -F"\t" 'BEGIN { RS="\0" }; { printf "%s\0", $2; }' | xargs -0 file -N | grep "text" | egrep -v "UTF-8|ASCII|CSV|XML|EPS|FIG|assembler source|Perl script|from flex") txt_not_utf8=$(git ls-files -z --stage | awk -F"\t" 'BEGIN { RS="\0" }; { printf "%s\n", $2; }' | xargs file -N | grep "text" | egrep -v "UTF-8|ASCII|CSV|XML|EPS|FIG|assembler source|Perl script|from flex")
if [ -n "${txt_not_utf8}" ]; then if [ -n "${txt_not_utf8}" ]; then
echo "The following files have non utf-8 characters:" echo "The following files have non utf-8 characters:"
echo ${txt_not_utf8} echo ${txt_not_utf8}