chore(ci): use merge-base in check for added changelog fragments (#690)

mezmo · Feb 9, 2024 · 5b558be · 5b558be
1 parent 25d0b2c
commit 5b558be
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/scripts/check_changelog_fragments.sh b/scripts/check_changelog_fragments.sh
@@ -17,7 +17,7 @@ if [ ! -d "${CHANGELOG_DIR}" ]; then
 fi
 
 # diff-filter=A lists only added files
-FRAGMENTS=$(git diff --name-only --diff-filter=A origin/main ${CHANGELOG_DIR})
+FRAGMENTS=$(git diff --name-only --diff-filter=A --merge-base origin/main ${CHANGELOG_DIR})
 
 if [ -z "$FRAGMENTS" ]; then
   echo "No changelog fragments detected"