From 283c030497b455ecfa759d4649f9f8b45158742e Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Tue, 10 Dec 2024 13:35:09 -0800 Subject: [PATCH] Fix bug --- services/pull/patch.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/pull/patch.go b/services/pull/patch.go index c5befe39d6..ef7c366f06 100644 --- a/services/pull/patch.go +++ b/services/pull/patch.go @@ -366,7 +366,7 @@ func checkConflicts(ctx context.Context, pr *issues_model.PullRequest, gitRepo * _ = util.Remove(tmpPatchFile.Name()) }() - if err := gitRepo.GetDiffBinary(pr.MergeBase+"..tracking", tmpPatchFile); err != nil { + if err := gitRepo.GetDiffBinary(pr.MergeBase+"...tracking", tmpPatchFile); err != nil { tmpPatchFile.Close() log.Error("Unable to get patch file from %s to %s in %s Error: %v", pr.MergeBase, pr.HeadBranch, pr.BaseRepo.FullName(), err) return false, fmt.Errorf("unable to get patch file from %s to %s in %s Error: %w", pr.MergeBase, pr.HeadBranch, pr.BaseRepo.FullName(), err)