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 bd61e5f7026024f7a7bdc9bf3e2402a4081bde1c..1e2a9da0b05c3fdf72929f71693197a92af91762 100755 (executable)
--- 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 a7c385293c8365b8d6b98cc1bf2676aaaa3a4cbd..35b60095a362aac993e689604c75a15b5c84a5bc 100755 (executable)
--- 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