fix: commit annotator fails on merge commits - #1846
Merged
Merged
Conversation
The `parent()` method returns all parent hashes as a space-separated string. For merge commits, this returns two hashes (e.g., "abc123 def456"), which when passed to subsequent git commands fails with "ambiguous argument". Fix by splitting the output and returning only the first parent, which follows the main line of development.
pietrodimarco-dfinity
approved these changes
Dec 12, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
parent()method returned all parent hashes as a single space-separated string (e.g.,"abc123 def456"for merge commits)fatal: ambiguous argumentTest plan
73ec91ef026f5163c35d991eb38e98890ac8e8c0