]> source.dussan.org Git - gitea.git/commit
projects / gitea.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a33db35) | patch
Fix Pull Merge when tag with same name as base branch exist (#13882)
authora1012112796 <1012112796@qq.com>
Tue, 8 Dec 2020 01:46:50 +0000 (09:46 +0800)
committerGitHub <noreply@github.com>
Tue, 8 Dec 2020 01:46:50 +0000 (02:46 +0100)
commit682f0b046066ee64f9a6c8881377b304db3e6f9d
tree8d7233ca2763ea4d3e3a42d3eaeffb9c1de2a138tree | snapshot
parenta33db35b386ebd92759fed154774cf6a6a7b4fa2commit | diff
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>
services/pull/merge.go diff | blob | history
Git with a cup of tea! Painless self-hosted all-in-one software development service, including Git hosting, code review, team collaboration, package registry and CI/CD: https://github.com/go-gitea/gitea