From b6fea4add0081868aedcb093b9641c5df1038384 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Wed, 21 Feb 2024 17:40:32 +1100 Subject: [PATCH] make_tree_file, message_helper: get around grep binary file behaviour These files are not binary but may contain some control characters --- make_tree_file | 2 +- message_helper | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/make_tree_file b/make_tree_file index bd61e5f..1e2a9da 100755 --- a/make_tree_file +++ b/make_tree_file @@ -45,7 +45,7 @@ mkdir Next mv ../SHA1s Next/SHA1s -grep -v '^Checking out files:' ../merge.log >Next/merge.log +grep -a -v '^Checking out files:' ../merge.log >Next/merge.log printf -- '-next-%s\n' "$d" >localversion-next diff --git a/message_helper b/message_helper index a7c3852..35b6009 100755 --- a/message_helper +++ b/message_helper @@ -28,7 +28,7 @@ cc=( 'Linux Next Mailing List ' "$@" ) if [ -z "$branch" ]; then - branch=$(grep '^Merging ' "$log" | grep -v ' version ' | tail -n 1 | + branch=$(grep -a '^Merging ' "$log" | grep -a -v ' version ' | tail -n 1 | sed 's/^Merging \([^ /]*\).*$/\1/') fi -- 2.39.5