Fix git command for detecting changed files in multi-parent merge commits#97
Open
h4iku wants to merge 1 commit intosoarsmu:masterfrom
Open
Fix git command for detecting changed files in multi-parent merge commits#97h4iku wants to merge 1 commit intosoarsmu:masterfrom
h4iku wants to merge 1 commit intosoarsmu:masterfrom
Conversation
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.
When the fixed commit is a merge commit with multiple parents, the checkout script's
git show --name-onlycommand fails to list changed files because Git cannot determine which parent to compare against. As a result, some fixed checkout versions remain in a buggy state with updated tests, causing those tests to fail.An example is the bug 2 of luigi, where the fix commit is a merge commit with two parents and running
git show --name-onlyon it returns only the commit message:Changing the command to
git show --name-only --first-parentreturns the expected two changed files: