Skip to content

Fix creating pull request failure when the target branch name is the same as some tag #35552

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

Merged
merged 5 commits into from
Oct 3, 2025
+1 −1
Merged

Fix creating pull request failure when the target branch name is the same as some tag #35552

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
de9135e
Fix creating pull request failure when the target branch name is the …
lunny Sep 30, 2025
60e60ca
Merge branch 'main' into lunny/fix_same_tag_branch_create_pr
lunny Oct 1, 2025
80de9de
Merge branch 'main' into lunny/fix_same_tag_branch_create_pr
lunny Oct 3, 2025
65d82a5
Merge branch 'main' into lunny/fix_same_tag_branch_create_pr
GiteaBot Oct 3, 2025
d23aca4
Merge branch 'main' into lunny/fix_same_tag_branch_create_pr
GiteaBot Oct 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion services/pull/temp_repo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ func createTemporaryRepoForPR(ctx context.Context, pr *issues_model.PullRequest)
return nil, nil, fmt.Errorf("Unable to add base repository as origin [%s -> tmpBasePath]: %w\n%s\n%s", pr.BaseRepo.FullName(), err, prCtx.outbuf.String(), prCtx.errbuf.String())
}

if err := gitcmd.NewCommand("fetch", "origin").AddArguments(fetchArgs...).AddDashesAndList(pr.BaseBranch+":"+baseBranch, pr.BaseBranch+":original_"+baseBranch).
if err := gitcmd.NewCommand("fetch", "origin").AddArguments(fetchArgs...).AddDashesAndList(git.BranchPrefix+pr.BaseBranch+":"+git.BranchPrefix+baseBranch, git.BranchPrefix+pr.BaseBranch+":"+git.BranchPrefix+"original_"+baseBranch).
Run(ctx, prCtx.RunOpts()); err != nil {
log.Error("%-v Unable to fetch origin base branch [%s:%s -> base, original_base in %s]: %v:\n%s\n%s", pr, pr.BaseRepo.FullName(), pr.BaseBranch, tmpBasePath, err, prCtx.outbuf.String(), prCtx.errbuf.String())
cancel()
Expand Down