From 50e237759a0aa378b32393ba57d50eaaff5029e0 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Sat, 22 Apr 2023 20:30:17 -0400
Subject: Use git diff to search for changelog entry

---
 tools/check-changelog | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

(limited to 'tools')

diff --git a/tools/check-changelog b/tools/check-changelog
index b94b52755..0b57c4d1e 100644
--- a/tools/check-changelog
+++ b/tools/check-changelog
@@ -1,22 +1,15 @@
 #!/bin/sh
 
-echo "looking for change log of $CI_MERGE_REQUEST_IID"
+echo "looking for change log"
 
-count=0
-for i in add remove fix security skip; do
-    [ -f changelog.d/"$CI_MERGE_REQUEST_IID"."$i" ]
-    retcode=$?
-    if [ $retcode -eq 0 ]; then
-        echo "found $CI_MERGE_REQUEST_IID.$i"
-        count=$(( count + 1 ))
-    else
-        echo "no $CI_MERGE_REQUEST_IID.$i"
-    fi
-done
-if [ $count -gt 0 ]; then
-    echo "ok"
+git diff --raw $CI_MERGE_REQUEST_TARGET_BRANCH_NAME HEAD -- changelog.d | \
+    grep ' A\t' | grep '\.\(skip\|add\|remove\|fix\|security\)$'
+ret=$?
+
+if [ $ret -eq 0 ]; then
+    echo "found a changelog entry"
     exit 0
 else
-    echo "must have a changelog entry or explicitly skip it"
+    echo "changelog entry not found"
     exit 1
 fi
-- 
cgit v1.2.3


From e13b331762881933d66597b3145b4d20d6e51912 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Sat, 22 Apr 2023 20:40:39 -0400
Subject: Fetch upstream in the repo

---
 tools/check-changelog | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/check-changelog b/tools/check-changelog
index 0b57c4d1e..1409be9f0 100644
--- a/tools/check-changelog
+++ b/tools/check-changelog
@@ -2,7 +2,10 @@
 
 echo "looking for change log"
 
-git diff --raw $CI_MERGE_REQUEST_TARGET_BRANCH_NAME HEAD -- changelog.d | \
+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 upstream/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME HEAD -- changelog.d | \
     grep ' A\t' | grep '\.\(skip\|add\|remove\|fix\|security\)$'
 ret=$?
 
-- 
cgit v1.2.3


From 6a3fd8e01404f7fc4415626300d81c65c045a7d6 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Tue, 2 May 2023 22:16:00 -0400
Subject: Do not count for renames when diffing

---
 tools/check-changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/check-changelog b/tools/check-changelog
index 1409be9f0..60692033f 100644
--- a/tools/check-changelog
+++ b/tools/check-changelog
@@ -5,7 +5,7 @@ echo "looking for change log"
 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 upstream/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME HEAD -- changelog.d | \
+git diff --raw --no-renames upstream/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME HEAD -- changelog.d | \
     grep ' A\t' | grep '\.\(skip\|add\|remove\|fix\|security\)$'
 ret=$?
 
-- 
cgit v1.2.3