Skip to content

Commit

Permalink
fix(mkreleaselog): specify the parent commit when diffing
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Stebalien authored and aschmahmann committed Aug 23, 2021
1 parent 3dcf651 commit 4e132af
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions bin/mkreleaselog
Original file line number Diff line number Diff line change
Expand Up @@ -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 ]]
}
Expand Down Expand Up @@ -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 |
Expand Down

0 comments on commit 4e132af

Please sign in to comment.