logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: aef1a88dc65bbcb46e9244a14d5bbeff9cdbcddc
parent 17524865e528e69ee92ab3e3911782d79b4b3be0
Author: feld <feld@feld.me>
Date:   Wed,  8 Nov 2023 17:28:14 +0000

Merge branch 'changelogd-fix' into 'develop'

Fix changelogd grep syntax error

See merge request pleroma/pleroma!3973

Diffstat:

Mtools/check-changelog2+-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/check-changelog b/tools/check-changelog @@ -6,7 +6,7 @@ git remote add upstream https://git.pleroma.social/pleroma/pleroma.git git fetch upstream ${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}:refs/remotes/upstream/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME git diff --raw --no-renames upstream/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME HEAD -- changelog.d | \ - grep ' A\t' | grep '\.\(skip\|add\|remove\|fix\|security|change\)$' + grep ' A\t' | grep '\.\(skip\|add\|remove\|fix\|security\|change\)$' ret=$? if [ $ret -eq 0 ]; then