Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Pull Merge when tag with same name as base branch exist #13882

Merged
merged 3 commits into from
Dec 8, 2020
Merged

Fix Pull Merge when tag with same name as base branch exist #13882

merged 3 commits into from
Dec 8, 2020

Conversation

a1012112796
Copy link
Member

fix dst refspec error in 'Push back to upstream' when base branch have
same name with a tag.

fix #13851

@a1012112796
fix 'dst refspec error' when merge a pr
3f1535c 
fix dst refspec error in 'Push back to upstream' when base branch have
same name with a tag.

fix go-gitea#13851
Signed-off-by: a1012112796 <[email protected]>
@lafriks lafriks added this to the 1.14.0 milestone Dec 7, 2020
@codecov-io
Copy link

codecov-io commented Dec 7, 2020 •
edited
Loading

Codecov Report

Merging #13882 (baab366) into master (a33db35) will decrease coverage by 0.01%.
The diff coverage is 0.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #13882      +/-   ##
==========================================
- Coverage   42.27%   42.26%   -0.02%     
==========================================
  Files         708      708              
  Lines       77191    77191              
==========================================
- Hits        32634    32621      -13     
- Misses      39198    39199       +1     
- Partials     5359     5371      +12
Impacted Files Coverage Δ
services/pull/merge.go 49.18% <0.00%> (ø)
modules/util/timer.go 42.85% <0.00%> (-42.86%) ⬇️
modules/notification/ui/ui.go 93.05% <0.00%> (-2.78%) ⬇️
services/pull/check.go 49.63% <0.00%> (-1.46%) ⬇️
models/notification.go 66.25% <0.00%> (-0.99%) ⬇️
models/error.go 38.17% <0.00%> (-0.82%) ⬇️
models/issue_comment.go 52.26% <0.00%> (-0.46%) ⬇️
services/pull/pull.go 40.68% <0.00%> (ø)
modules/notification/mail/mail.go 39.08% <0.00%> (ø)
services/mailer/mail.go 61.29% <0.00%> (+1.07%) ⬆️
... and 1 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a33db35...baab366. Read the comment docs.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Dec 7, 2020
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Dec 7, 2020
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Dec 7, 2020
@6543 6543 merged commit 682f0b0 into go-gitea:master Dec 8, 2020
@6543 6543 changed the title fix 'dst refspec error' when merge a pr Fix Pull Merge when tag with same name as base branch exist Dec 8, 2020
@6543
Copy link
Member

6543 commented Dec 8, 2020

@a1012112796 pleace backport ;)

@a1012112796 a1012112796 deleted the fix_push branch December 8, 2020 07:17
a1012112796 added a commit to a1012112796/gitea that referenced this pull request Dec 8, 2020
@a1012112796 @6543 @zeripath
Fix Pull Merge when tag with same name as base branch exist (go-gitea…
9813e6d 
…#13882)

fix dst refspec error in 'Push back to upstream' when base branch have
same name with a tag.

fix go-gitea#13851
Signed-off-by: a1012112796 <[email protected]>

Co-authored-by: 6543 <[email protected]>
Co-authored-by: zeripath <[email protected]>
@a1012112796 a1012112796 mentioned this pull request Dec 8, 2020
Merged
@a1012112796 a1012112796 added the backport/done All backports for this PR have been created label Dec 8, 2020
6543 added a commit that referenced this pull request Dec 8, 2020
@a1012112796 @6543 @zeripath
Fix Pull Merge when tag with same name as base branch exist (#13882) (#…
c0b1197 
…13896)

fix dst refspec error in 'Push back to upstream' when base branch have
same name with a tag.

fix #13851
Signed-off-by: a1012112796 <[email protected]>

Co-authored-by: 6543 <[email protected]>
Co-authored-by: zeripath <[email protected]>
@zeripath zeripath mentioned this pull request Dec 14, 2020
Closed
4 tasks
zeripath added a commit to zeripath/gitea that referenced this pull request Dec 14, 2020
@zeripath
Trim the branch prefix from action.GetBranch
4d30182 
 go-gitea#13882 has revealed that the refname of an action is actually only a
refname pattern and necessarily a branch. For examplem pushing to
refs/heads/master will result in action with refname refs/heads/master
but pushing to master will result in a refname master.

The simplest solution to providing a fix here is to trim the prefix
therefore this PR proposes this.

Signed-off-by: Andrew Thornton <[email protected]>
@zeripath zeripath mentioned this pull request Dec 14, 2020
Merged
lafriks pushed a commit that referenced this pull request Dec 14, 2020
@zeripath @a1012112796
Trim the branch prefix from action.GetBranch (#13981)
c3fc190 
* Trim the branch prefix from action.GetBranch

 #13882 has revealed that the refname of an action is actually only a
refname pattern and necessarily a branch. For examplem pushing to
refs/heads/master will result in action with refname refs/heads/master
but pushing to master will result in a refname master.

The simplest solution to providing a fix here is to trim the prefix
therefore this PR proposes this.

Signed-off-by: Andrew Thornton <[email protected]>

* Update models/action.go

Co-authored-by: a1012112796 <[email protected]>

Co-authored-by: a1012112796 <[email protected]>
zeripath added a commit to zeripath/gitea that referenced this pull request Dec 14, 2020
@zeripath @a1012112796
Trim the branch prefix from action.GetBranch (go-gitea#13981)
d0682ba 
Backport go-gitea#13981

 go-gitea#13882 has revealed that the refname of an action is actually only a
refname pattern and necessarily a branch. For examplem pushing to
refs/heads/master will result in action with refname refs/heads/master
but pushing to master will result in a refname master.

The simplest solution to providing a fix here is to trim the prefix
therefore this PR proposes this.

Signed-off-by: Andrew Thornton <[email protected]>
Co-authored-by: a1012112796 <[email protected]>
@zeripath zeripath mentioned this pull request Dec 14, 2020
Merged
techknowlogick pushed a commit that referenced this pull request Dec 14, 2020
@zeripath @a1012112796
Trim the branch prefix from action.GetBranch (#13981) (#13986)
7f85728 
Backport #13981

 #13882 has revealed that the refname of an action is actually only a
refname pattern and necessarily a branch. For examplem pushing to
refs/heads/master will result in action with refname refs/heads/master
but pushing to master will result in a refname master.

The simplest solution to providing a fix here is to trim the prefix
therefore this PR proposes this.

Signed-off-by: Andrew Thornton <[email protected]>
Co-authored-by: a1012112796 <[email protected]>

Co-authored-by: a1012112796 <[email protected]>
@go-gitea go-gitea locked and limited conversation to collaborators Jan 18, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@6543 6543 6543 approved these changes

@zeripath zeripath zeripath approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug
Projects
None yet
Milestone
1.14.0
Development

Successfully merging this pull request may close these issues.

Don't merge PR if tag and name of branch with this name
6 participants
@a1012112796 @codecov-io @6543 @zeripath @lafriks @GiteaBot