From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 21 Feb 2024 06:39:45 +0000 (+1100)
Subject: make_summ: improve regexp
X-Git-Url: https://git.ozlabs.org/?a=commitdiff_plain;h=66cda05bf66d7c262e40508771d800484909fc5f;p=next-scripts

make_summ: improve regexp
---

diff --git a/make_summ b/make_summ
index 0d0c7ba..d7fb6ee 100755
--- a/make_summ
+++ b/make_summ
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 tr '\r' '\n' <merge.log |
-	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
+	grep -E -a '^(\[|  )|(git (cherry|rm|reset|checkout|quiltimport|merge --abort|rebase))|Merging|Applying|CONFLICT|Revert|Created commit|dropping' |
+	grep -E -a -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