Use gitRepo.GetRefCommitID to be consistent

jedi7 · jedi7 · commit 68c4d7ee3183 · 2022-07-13T11:06:21.000+02:00
diff --git a/services/pull/patch.go b/services/pull/patch.go
@@ -87,6 +87,14 @@ func TestPatch(pr *issues_model.PullRequest) error {
 		}
 	}
 	pr.MergeBase = strings.TrimSpace(pr.MergeBase)
+	if pr.HeadCommitID, err = gitRepo.GetRefCommitID(git.BranchPrefix + "tracking"); err != nil {
+		return fmt.Errorf("GetBranchCommitID: can't find commit ID for head: %w", err)
+	}
+
+	if pr.HeadCommitID == pr.MergeBase {
+		pr.Status = issues_model.PullRequestStatusAncestor
+		return nil
+	}
 
 	// 2. Check for conflicts
 	if conflicts, err := checkConflicts(ctx, pr, gitRepo, tmpBasePath); err != nil || conflicts || pr.Status == issues_model.PullRequestStatusEmpty {

Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,14 @@ func TestPatch(pr *issues_model.PullRequest) error {`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`	`pr.MergeBase = strings.TrimSpace(pr.MergeBase)`
	`90`	`+ if pr.HeadCommitID, err = gitRepo.GetRefCommitID(git.BranchPrefix + "tracking"); err != nil {`
	`91`	`+ return fmt.Errorf("GetBranchCommitID: can't find commit ID for head: %w", err)`
	`92`	`+ }`
	`93`	`+`
	`94`	`+ if pr.HeadCommitID == pr.MergeBase {`
	`95`	`+ pr.Status = issues_model.PullRequestStatusAncestor`
	`96`	`+ return nil`
	`97`	`+ }`
`90`	`98`
`91`	`99`	`// 2. Check for conflicts`
`92`	`100`	`if conflicts, err := checkConflicts(ctx, pr, gitRepo, tmpBasePath); err != nil \|\| conflicts \|\| pr.Status == issues_model.PullRequestStatusEmpty {`