fix bug about can't skip commits base on base branch

models/issue_comment.go

@@ -1124,12 +1124,11 @@ func getCommitIDsFromRepo(repo *Repository, oldCommitID, newCommitID, baseBranch
 		return nil, false, err
 	}
 
-	oldCommitBranch, err := oldCommit.GetBranchName()
-	if err != nil {
+	if err = oldCommit.LoadBranchName(); err != nil {
 		return nil, false, err
 	}
 
-	if oldCommitBranch == "" {
+	if oldCommit.Branch == "" {
 		commitIDs = make([]string, 2)
 		commitIDs[0] = oldCommitID
 		commitIDs[1] = newCommitID
@@ -1142,25 +1141,102 @@ func getCommitIDsFromRepo(repo *Repository, oldCommitID, newCommitID, baseBranch
 		return nil, false, err
 	}
 
-	var commits *list.List
+	var (
+		commits      *list.List
+		commitChecks map[string]commitBranchCheckItem
+	)
 	commits, err = newCommit.CommitsBeforeUntil(oldCommitID)
 	if err != nil {
 		return nil, false, err
 	}
 
 	commitIDs = make([]string, 0, commits.Len())
+	commitChecks = make(map[string]commitBranchCheckItem)
 
-	for e := commits.Back(); e != nil; e = e.Prev() {
-		commit := e.Value.(*git.Commit)
-		commitBranch, err := commit.GetBranchName()
-		if err != nil {
-			return nil, false, err
+	for e := commits.Front(); e != nil; e = e.Next() {
+		commitChecks[e.Value.(*git.Commit).ID.String()] = commitBranchCheckItem{
+			Commit:  e.Value.(*git.Commit),
+			Checked: false,
 		}
+	}
 
-		if commitBranch != baseBranch {
-			commitIDs = append(commitIDs, commit.ID.String())
+	if err = commitBranchCheck(gitRepo, newCommit, oldCommitID, baseBranch, commitChecks); err != nil {
+		return
+	}
+
+	for e := commits.Back(); e != nil; e = e.Prev() {
+		commitID := e.Value.(*git.Commit).ID.String()
+		if item, ok := commitChecks[commitID]; ok && item.Checked {
+			commitIDs = append(commitIDs, commitID)
 		}
 	}
 
 	return
 }
+
+type commitBranchCheckItem struct {
+	Commit  *git.Commit
+	Checked bool
+}
+
+func commitBranchCheck(gitRepo *git.Repository, startCommit *git.Commit, endCommitID, baseBranch string, commitList map[string]commitBranchCheckItem) (err error) {
+	var (
+		item     commitBranchCheckItem
+		ok       bool
+		listItem *list.Element
+		tmp      string
+	)
+
+	if startCommit.ID.String() == endCommitID {
+		return
+	}
+
+	checkStack := list.New()
+	checkStack.PushBack(startCommit.ID.String())
+	listItem = checkStack.Back()
+
+	for listItem != nil {
+		tmp = listItem.Value.(string)
+		checkStack.Remove(listItem)
+
+		if item, ok = commitList[tmp]; !ok {
+			listItem = checkStack.Back()
+			continue
+		}
+
+		if item.Commit.ID.String() == endCommitID {
+			listItem = checkStack.Back()
+			continue
+		}
+
+		if err = item.Commit.LoadBranchName(); err != nil {
+			return
+		}
+
+		if item.Commit.Branch == baseBranch {
+			listItem = checkStack.Back()
+			continue
+		}
+
+		if item.Checked {
+			listItem = checkStack.Back()
+			continue
+		}
+
+		item.Checked = true
+		commitList[tmp] = item
+
+		parentNum := item.Commit.ParentCount()
+		for i := 0; i < parentNum; i++ {
+			var parentCommit *git.Commit
+			parentCommit, err = item.Commit.Parent(i)
+			if err != nil {
+				return
+			}
+			checkStack.PushBack(parentCommit.ID.String())
+		}
+
+		listItem = checkStack.Back()
+	}
+	return nil
+}

modules/git/commit.go

@@ -482,6 +482,16 @@ func (c *Commit) GetBranchName() (string, error) {
 	return strings.SplitN(strings.TrimSpace(data), "~", 2)[0], nil
 }
 
+// LoadBranchName load branch name for commit
+func (c *Commit) LoadBranchName() (err error) {
+	if len(c.Branch) != 0 {
+		return
+	}
+
+	c.Branch, err = c.GetBranchName()
+	return
+}
+
 // GetTagName gets the current tag name for given commit
 func (c *Commit) GetTagName() (string, error) {
 	data, err := NewCommand("describe", "--exact-match", "--tags", "--always", c.ID.String()).RunInDir(c.repo.Path)