Force-push to base repo's ref/pull/#/head #3393
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
Fixes force-pushing to pull request branches, otherwise failing with: [...gitea/models/pull.go:1022 AddTestPullRequestTask()] [E] PushToBaseRepo: Push: exit status 1 - To /path/to/gitea-repositories/org/repo.git ! [rejected] issue-fix -> refs/pull/20/head (non-fast-forward)
|
Incorrect spacing but otherwise LGTM |
tboerger
added
the
lgtm/need 1
appleboy
approved these changes
Jan 18, 2018
tboerger
added
lgtm/done
|
@strk Shouldn't the behavior follow the user's action? If user pushed with |
|
On Thu, Jan 18, 2018 at 06:54:03AM -0800, Lunny Xiao wrote:
@strk Shouldn't the behavior follow the user's action? If user pushed with `--force` or a checkbox on the UI, that could be true?
There's no point for refs/pulls/xxx to ever be different from the
actual pull request numbered xxx, so we should not support such
occurrence and thus always force-push to it
|
Codecov Report
@@ Coverage Diff @@
## master #3393 +/- ##
=========================================
- Coverage 35.6% 35.6% -0.01%
=========================================
Files 281 281
Lines 40554 40555 +1
=========================================
- Hits 14440 14439 -1
- Misses 23978 23980 +2
Partials 2136 2136
Continue to review full report at Codecov.
|
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 force-pushing to pull request branches, otherwise failing with:
[...gitea/models/pull.go:1022 AddTestPullRequestTask()] [E] PushToBaseRepo: Push: exit status 1 - To /path/to/gitea-repositories/org/repo.git
! [rejected] issue-fix -> refs/pull/20/head (non-fast-forward)