]> git.ozlabs.org Git - next-scripts/commitdiff
make_summ: egrep is obsolete
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Oct 2023 22:15:53 +0000 (09:15 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Oct 2023 22:15:53 +0000 (09:15 +1100)
make_summ

index 73e5ee4756e251cbd024c38224b96574c655e2da..0d0c7baf6dcb6cd92e2dc1c85df07d3fcfbf6498 100755 (executable)
--- a/make_summ
+++ b/make_summ
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 tr '\r' '\n' <merge.log |
-       egrep '^\[|(git (cherry|rm|reset|checkout|quiltimport|merge --abort|rebase))|Merging|Applying|CONFLICT|Revert|Created commit|dropping' |
-       egrep -v 'reset HEAD\^|^Created commit [0-9a-f]*: Merge (branch|commit)|mark the corrected paths|HEAD is now at|^\[master [0-9a-f]*\] (Merge( remote(-tracking)?)? branch|[0-9]*/)|^hint:|-Revert' >summ
+       grep -E '^\[|(git (cherry|rm|reset|checkout|quiltimport|merge --abort|rebase))|Merging|Applying|CONFLICT|Revert|Created commit|dropping' |
+       grep -E -v 'reset HEAD\^|^Created commit [0-9a-f]*: Merge (branch|commit)|mark the corrected paths|HEAD is now at|^\[master [0-9a-f]*\] (Merge( remote(-tracking)?)? branch|[0-9]*/)|^hint:|-Revert' >summ
 
 exit 0