From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 21 Feb 2024 06:40:32 +0000 (+1100)
Subject: make_tree_file, message_helper: get around grep binary file behaviour
X-Git-Url: https://git.ozlabs.org/?a=commitdiff_plain;h=b6fea4add0081868aedcb093b9641c5df1038384;p=next-scripts

make_tree_file, message_helper: get around grep binary file behaviour

These files are not binary but may contain some control characters
---

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 <linux-next@vger.kernel.org>'
 	"$@" )
 
 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