From 04de5d8e54ec412b08ea73ece211f15ef8ab6758 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Fri, 6 Oct 2023 09:15:53 +1100 Subject: [PATCH] make_summ: egrep is obsolete --- make_summ | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make_summ b/make_summ index 73e5ee4..0d0c7ba 100755 --- a/make_summ +++ b/make_summ @@ -1,7 +1,7 @@ #!/bin/bash tr '\r' '\n' 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 -- 2.39.5