Git 2.28 no longer permits diff with ... on unrelated branches#12364
Merged
Conversation
Signed-off-by: Andrew Thornton <art27@cantab.net>
This comment has been minimized.
This comment has been minimized.
GiteaBot
added
the
lgtm/need 2
zeripath
commented
Jul 29, 2020
Contributor
Author
|
OK try again - I missed checking the stderr properly |
GiteaBot
added
lgtm/need 1
zeripath
added a commit
to zeripath/gitea
that referenced
this pull request
Jul 29, 2020
Backport go-gitea#12364 Signed-off-by: Andrew Thornton <art27@cantab.net>
techknowlogick
pushed a commit
that referenced
this pull request
Jul 29, 2020
Backport #12364 Signed-off-by: Andrew Thornton <art27@cantab.net>
techknowlogick
approved these changes
Jul 29, 2020
GiteaBot
added
lgtm/done
6543
requested changes
Jul 29, 2020
6543
approved these changes
Jul 29, 2020
Member
6543
left a comment
6543
left a comment
There was a problem hiding this comment.
ok 🚀 (it had nothing to do with the git 2.28 problem)
techknowlogick
added
the
backport/done
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
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.
Annoyingly git 2.28 now strictly enforces that when doing
git diff base...headbase and head must have a merge-base. Unfortunately this is a breaking change as previously this would just fall back togit diff base head. Therefore we need to detect this new error and handle it.In preparation for further changes I have also predicted that rev-list base...head may break in future too. Therefore I have attempted to protect against this too.
1.12 will also be affected by this and therefore we should backport these changes if possible.
Closes #12362
Signed-off-by: Andrew Thornton art27@cantab.net