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. (cherry picked from commit 4e132af3ef11d4d1690a0e5b9e3639526eb742f6)
Steven Allen committed
Aug 23, 2021 at 11:07 UTC
0884f2dd7001ba07224556c54170ac4e2ff12034
1 file changed
+1
-2
bin/mkreleaselog
+1
-2
@@ -152,7 +152,7 @@ ignored_commit() {
152
local matches
153
154
# Check to see if this commit includes any non-ignored files.
155
- matches=$(git -C "$dir" diff-tree --no-commit-id --name-only -r "$commit" \
155
+ matches=$(git -C "$dir" diff-tree --no-commit-id --name-only -r "$commit^" "$commit" \
156
-- "${IGNORE_FILES_PATHSPEC[@]}" | wc -l)
157
[[ "$matches" -eq 0 ]]
158
}
@@ -262,7 +262,6 @@ recursive_release_log() {
262
printf -- "- %s:\n" "$module"
263
release_log "$module" "$start" "$end" | indent
264
265
-
265
statlog "$module" "$start" "$end" > statlog.json
266
267
dep_changes old_deps.json new_deps.json |