From 4e132af3ef11d4d1690a0e5b9e3639526eb742f6 Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Mon, 23 Aug 2021 11:07:30 -0700
Subject: [PATCH] fix(mkreleaselog): specify the parent commit when diffing

Specifically, if you specify a commit, you get only that commit. This
means you get _nothing_ if you specify a merge commit.

Now, we specify to diff between a commit and it's (merge) parent.
---
 bin/mkreleaselog | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bin/mkreleaselog b/bin/mkreleaselog
index 78a11b48a86..d9f91833707 100755
--- a/bin/mkreleaselog
+++ b/bin/mkreleaselog
@@ -152,7 +152,7 @@ ignored_commit() {
     local matches
 
     # Check to see if this commit includes any non-ignored files.
-    matches=$(git -C "$dir" diff-tree --no-commit-id --name-only -r "$commit" \
+    matches=$(git -C "$dir" diff-tree --no-commit-id --name-only -r "$commit^" "$commit" \
                   -- "${IGNORE_FILES_PATHSPEC[@]}" | wc -l)
     [[ "$matches" -eq 0 ]]
 }
@@ -262,7 +262,6 @@ recursive_release_log() {
         printf -- "- %s:\n" "$module"
         release_log "$module" "$start" "$end" | indent
 
-
         statlog "$module" "$start" "$end" > statlog.json
 
         dep_changes old_deps.json new_deps.json |