Fix pull merge 500 error caused by git-fetch breaking behaviors #8194
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
|
Backport for v1.9 |
GiteaBot
added
the
lgtm/need 2
guillep2k
approved these changes
Sep 16, 2019
GiteaBot
added
lgtm/need 1
|
Original PR #8161 |
lunny
approved these changes
Sep 16, 2019
GiteaBot
added
lgtm/done
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fixes #8133
The git version before 1.8.4 would not update remote refs automatically.
That causes the following git-diff-tree command to get 'bad revision' errors.
Use refspec for git-fetch explicitly to avoid the problem.