Skip to content

Commit 283c030

Browse files
committed
Fix bug
1 parent 48b5bab commit 283c030

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

services/pull/patch.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ func checkConflicts(ctx context.Context, pr *issues_model.PullRequest, gitRepo *
366366
_ = util.Remove(tmpPatchFile.Name())
367367
}()
368368

369-
if err := gitRepo.GetDiffBinary(pr.MergeBase+"..tracking", tmpPatchFile); err != nil {
369+
if err := gitRepo.GetDiffBinary(pr.MergeBase+"...tracking", tmpPatchFile); err != nil {
370370
tmpPatchFile.Close()
371371
log.Error("Unable to get patch file from %s to %s in %s Error: %v", pr.MergeBase, pr.HeadBranch, pr.BaseRepo.FullName(), err)
372372
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)

0 commit comments

Comments
 (0)