From a9bace959b25b8b877f29a0c96dcc25584171d6a Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Thu, 31 Mar 2022 09:18:28 +0200 Subject: [PATCH] increment_version.sh: fix some "Update codebase" cases Change-Id: I294c4818345dd062013847ab98b0cb0e296560ac --- increment_version.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/increment_version.sh b/increment_version.sh index 932f36ab90..cfac312676 100755 --- a/increment_version.sh +++ b/increment_version.sh @@ -147,7 +147,8 @@ git_changelog() { git log $git_args --pretty=format:"- %s" "$last_tag".. --committer="$(git config user.name)" \ | grep -v 'Automatic revert to unchanged upstream strings' \ | grep -v 'Automatic upstream merge preparation' \ - | sed "s|Merge tag '\\(.*\\)' into sc|Update codebase to Element \1|" \ + | sed "s|Merge tag '\\(.*\\)' into sc.*|Update codebase to Element \1|" \ + | sed "s|Merge tag '\\(.*\\)' into merge.*|Update codebase to Element \1|" \ | grep -v "Merge .*branch" \ | grep -v "Automatic color correction" \ | grep -v "Automatic upstream merge postprocessing" \