From 11ef70d495732caaf37a35464e906757563f2369 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Sun, 20 Dec 2020 09:20:18 +0100
Subject: [PATCH] increment_version: improve automatic changelog

Change-Id: I532751e7650145f8c2aaef42b1a1dbe9468dd013
---
 increment_version.sh | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/increment_version.sh b/increment_version.sh
index 1acaeae6bb..3d124a17de 100755
--- a/increment_version.sh
+++ b/increment_version.sh
@@ -103,7 +103,16 @@ set_prop "versionName" "\"$version\""
 changelog_dir=fastlane/metadata/android/en-US/changelogs
 changelog_file="$changelog_dir/$versionCode.txt"
 mkdir -p "$changelog_dir"
-git log --reverse --pretty=format:"- %s" "$last_tag".. --committer="$(git config user.name)" > "$changelog_file"
+echo "Automatic changelog from commit history:" > "$changelog_file"
+git log --reverse --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|" \
+    | grep -v "Automatic color correction" \
+    | grep -v "Automatic upstream merge postprocessing" \
+    | grep -v "Automatic SchildiChat string correction" \
+    | grep -v 'merge_helpers\|README\|increment_version' \
+    >> "$changelog_file"
 if [ "$release_type" != "test" ]; then
     $EDITOR "$changelog_file" || true
     read -p "Press enter when changelog is done"