diff options
author | zeripath <art27@cantab.net> | 2020-07-29 18:53:04 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-29 13:53:04 -0400 |
commit | 2f6aadffa8243736825564cd1ce32d0d5a1eb391 (patch) | |
tree | ffd0d52a2303e04bee16bf019d5670b5c54d9256 /modules/git/repo_commit.go | |
parent | f2a6cd6401d3d04c7b6c769d39d68262abbdaae1 (diff) | |
download | gitea-2f6aadffa8243736825564cd1ce32d0d5a1eb391.tar.gz gitea-2f6aadffa8243736825564cd1ce32d0d5a1eb391.zip |
Git 2.28 no longer permits diff with ... on unrelated branches (#12364)
* Git 2.28 no longer permits diff with ... on unrelated branches
Signed-off-by: Andrew Thornton <art27@cantab.net>
* need to check stderr
Diffstat (limited to 'modules/git/repo_commit.go')
-rw-r--r-- | modules/git/repo_commit.go | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/modules/git/repo_commit.go b/modules/git/repo_commit.go index 479a0d0370..4f04b2d363 100644 --- a/modules/git/repo_commit.go +++ b/modules/git/repo_commit.go @@ -319,7 +319,7 @@ func (repo *Repository) FileChangedBetweenCommits(filename, id1, id2 string) (bo // FileCommitsCount return the number of files at a revison func (repo *Repository) FileCommitsCount(revision, file string) (int64, error) { - return commitsCount(repo.Path, revision, file) + return commitsCount(repo.Path, []string{revision}, []string{file}) } // CommitsByFileAndRange return the commits according revison file and the page @@ -345,6 +345,11 @@ func (repo *Repository) CommitsByFileAndRangeNoFollow(revision, file string, pag // FilesCountBetween return the number of files changed between two commits func (repo *Repository) FilesCountBetween(startCommitID, endCommitID string) (int, error) { stdout, err := NewCommand("diff", "--name-only", startCommitID+"..."+endCommitID).RunInDir(repo.Path) + if err != nil && strings.Contains(err.Error(), "no merge base") { + // git >= 2.28 now returns an error if startCommitID and endCommitID have become unrelated. + // previously it would return the results of git diff --name-only startCommitID endCommitID so let's try that... + stdout, err = NewCommand("diff", "--name-only", startCommitID, endCommitID).RunInDir(repo.Path) + } if err != nil { return 0, err } @@ -359,6 +364,11 @@ func (repo *Repository) CommitsBetween(last *Commit, before *Commit) (*list.List stdout, err = NewCommand("rev-list", last.ID.String()).RunInDirBytes(repo.Path) } else { stdout, err = NewCommand("rev-list", before.ID.String()+"..."+last.ID.String()).RunInDirBytes(repo.Path) + if err != nil && strings.Contains(err.Error(), "no merge base") { + // future versions of git >= 2.28 are likely to return an error if before and last have become unrelated. + // previously it would return the results of git rev-list before last so let's try that... + stdout, err = NewCommand("rev-list", before.ID.String(), last.ID.String()).RunInDirBytes(repo.Path) + } } if err != nil { return nil, err @@ -374,6 +384,11 @@ func (repo *Repository) CommitsBetweenLimit(last *Commit, before *Commit, limit, stdout, err = NewCommand("rev-list", "--max-count", strconv.Itoa(limit), "--skip", strconv.Itoa(skip), last.ID.String()).RunInDirBytes(repo.Path) } else { stdout, err = NewCommand("rev-list", "--max-count", strconv.Itoa(limit), "--skip", strconv.Itoa(skip), before.ID.String()+"..."+last.ID.String()).RunInDirBytes(repo.Path) + if err != nil && strings.Contains(err.Error(), "no merge base") { + // future versions of git >= 2.28 are likely to return an error if before and last have become unrelated. + // previously it would return the results of git rev-list --max-count n before last so let's try that... + stdout, err = NewCommand("rev-list", "--max-count", strconv.Itoa(limit), "--skip", strconv.Itoa(skip), before.ID.String(), last.ID.String()).RunInDirBytes(repo.Path) + } } if err != nil { return nil, err @@ -399,7 +414,14 @@ func (repo *Repository) CommitsBetweenIDs(last, before string) (*list.List, erro // CommitsCountBetween return numbers of commits between two commits func (repo *Repository) CommitsCountBetween(start, end string) (int64, error) { - return commitsCount(repo.Path, start+"..."+end, "") + count, err := commitsCount(repo.Path, []string{start + "..." + end}, []string{}) + if err != nil && strings.Contains(err.Error(), "no merge base") { + // future versions of git >= 2.28 are likely to return an error if before and last have become unrelated. + // previously it would return the results of git rev-list before last so let's try that... + return commitsCount(repo.Path, []string{start, end}, []string{}) + } + + return count, err } // commitsBefore the limit is depth, not total number of returned commits. |