Add StatusAncestor

Signed-off-by: Andrew Thornton <art27@cantab.net>

Author: zeripath

models/issues/pull.go

@@ -122,6 +122,7 @@ const (
 	PullRequestStatusManuallyMerged
 	PullRequestStatusError
 	PullRequestStatusEmpty
+	PullRequestStatusAncestor
 )
 
 // PullRequestFlow the flow of pull request
@@ -425,7 +426,7 @@ func (pr *PullRequest) IsEmpty() bool {
 
 // IsAncestor returns true if the Head Commit of this PR is an ancestor of the Base Commit
 func (pr *PullRequest) IsAncestor() bool {
-	return pr.HeadCommitID == pr.MergeBase
+	return pr.Status == PullRequestStatusAncestor
 }
 
 // SetMerged sets a pull request to merged and closes the corresponding issue

services/pull/patch.go

@@ -87,9 +87,12 @@ func TestPatch(pr *issues_model.PullRequest) error {
 		}
 	}
 	pr.MergeBase = strings.TrimSpace(pr.MergeBase)
+	if pr.HeadCommitID, err = gitRepo.GetBranchCommitID("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.PullRequestStatusEmpty
+		pr.Status = issues_model.PullRequestStatusAncestor
 		return nil
 	}