Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

HasPreviousCommit causes recursive load of commits unnecessarily (#14598) #14649

Merged
merged 3 commits into from
Feb 14, 2021
Merged

HasPreviousCommit causes recursive load of commits unnecessarily (#14598) #14649

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
daef4ab
HasPreviousCommit causes recursive load of commits unnecessarily (#14…
zeripath Feb 10, 2021
e287a9a
Merge branch 'release/v1.13' into backport-14598
zeripath Feb 13, 2021
e4a7f2c
Merge branch 'release/v1.13' into backport-14598
6543 Feb 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 25 additions & 13 deletions modules/git/commit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"bufio"
"bytes"
"container/list"
"errors"
"fmt"
"image"
"image/color"
Expand All @@ -17,6 +18,7 @@ import (
_ "image/png" // for processing png images
"io"
"net/http"
"os/exec"
"strconv"
"strings"

Expand Down Expand Up @@ -309,23 +311,33 @@ func (c *Commit) CommitsBefore() (*list.List, error) {

// HasPreviousCommit returns true if a given commitHash is contained in commit's parents
func (c *Commit) HasPreviousCommit(commitHash SHA1) (bool, error) {
for i := 0; i < c.ParentCount(); i++ {
commit, err := c.Parent(i)
if err != nil {
return false, err
}
if commit.ID == commitHash {
this := c.ID.String()
that := commitHash.String()

if this == that {
return false, nil
}

if err := CheckGitVersionConstraint(">= 1.8.0"); err == nil {
_, err := NewCommand("merge-base", "--is-ancestor", that, this).RunInDir(c.repo.Path)
if err == nil {
return true, nil
}
commitInParentCommit, err := commit.HasPreviousCommit(commitHash)
if err != nil {
return false, err
}
if commitInParentCommit {
return true, nil
var exitError *exec.ExitError
if errors.As(err, &exitError) {
if exitError.ProcessState.ExitCode() == 1 && len(exitError.Stderr) == 0 {
return false, nil
}
}
return false, err
}

result, err := NewCommand("rev-list", "--ancestry-path", "-n1", that+".."+this, "--").RunInDir(c.repo.Path)
if err != nil {
return false, err
}
return false, nil

return len(strings.TrimSpace(result)) > 0, nil
}

// CommitsBeforeLimit returns num commits before current revision
Expand Down