fix: fixed merge commits detection #136
Merged
Conversation
This file contains 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
When searching for commits, `go-git` uses depth-first search by default. In cases where commits are brought in via a merge commit, the commits other than the merge commit itself will be missed, as the DFS will go down the commits directly from HEAD, and will exit upon finding the previous tag, before then searching other paths. This is fixed by using the sort orders `LogOrderCommitterTime` or `LogOrderBSF`. Here `LogOrderCommitterTime` was used as the `go-git` documentation says it has the highest compatibility with the `git log` CLI command.
|
This can be demonstrated with this repo: https://github.com/CallumKerson/test-git-history. With the changes in this branch, then the output changes to correctly bump the version: |
goloroden
approved these changes
Aug 16, 2024
|
@CallumKerson Thanks for submitting this PR, we are going to merge this and release a new version. |
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.
When searching for commits,
go-gituses depth-first search by default. In cases where commits are brought in via a merge commit, the commits other than the merge commit itself will be missed, as the DFS will go down the commits directly from HEAD, and will exit upon finding the previous tag, before then searching other paths. This is fixed by using the sort ordersLogOrderCommitterTimeorLogOrderBSF. HereLogOrderCommitterTimewas used as thego-gitdocumentation says it has the highest compatibility with thegit logCLI command.