From d348447017a03d2b5c267b4b3db67fb6931ee741 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Wed, 2 Sep 2020 15:03:41 +0200
Subject: shellrc.d/git: fix gitbmerge to work with new Gitlab format

---
 shellrc.d/git | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'shellrc.d')

diff --git a/shellrc.d/git b/shellrc.d/git
index 493d89b..3cf6117 100644
--- a/shellrc.d/git
+++ b/shellrc.d/git
@@ -16,7 +16,7 @@ gitbmerge() (
 			echo "First squash fixups!"
 			return 1
 		}
-		[ -z "$(git log --grep="^Apply suggestion to " HEAD.."$1")" ] || {
+		[ -z "$(git log --grep="^Apply .* suggestion(s) to " HEAD.."$1")" ] || {
 			echo "First squash suggestions!"
 			return 1
 		}
-- 
cgit v1.2.3