1
1
mirror of https://github.com/go-gitea/gitea.git synced 2024-11-19 00:24:43 +01:00
gitea/services/pull
a1012112796 682f0b0460
Fix Pull Merge when tag with same name as base branch exist (#13882)
fix dst refspec error in 'Push back to upstream' when base branch have
same name with a tag.

fix #13851
Signed-off-by: a1012112796 <1012112796@qq.com>

Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: zeripath <art27@cantab.net>
2020-12-08 02:46:50 +01:00
..
check_test.go
check.go [Enhancement] Allow admin to merge pr with protected file changes (#12078) 2020-10-13 14:50:57 -04:00
commit_status.go
lfs.go
main_test.go
merge.go Fix Pull Merge when tag with same name as base branch exist (#13882) 2020-12-08 02:46:50 +01:00
patch.go [Enhancement] Allow admin to merge pr with protected file changes (#12078) 2020-10-13 14:50:57 -04:00
pull_test.go
pull.go Increment skip to avoid infini-loop (#13703) 2020-11-27 22:00:52 +02:00
review.go Comments on review should have the same sha (#13448) 2020-11-09 01:15:09 -05:00
temp_repo.go Handle more pathological branch and tag names (#11843) 2020-06-11 19:49:47 -04:00
update.go