Mirrors/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-04-04 03:35:05 +02:00
Code Issues Activity

Merge 7fe91f5ce47a327522bd08b291e10c15d0dd6fc7 into 30c07c20e94551141cc1873ab14bdd4c104bba94

Browse Source
This commit is contained in:
Lunny Xiao 2026-04-03 08:44:45 +02:00 committed by GitHub
commit 8338dd7fac
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/git/repo_commit.go
View File

@ -283,7 +283,7 @@ func (repo *Repository) FilesCountBetween(startCommitID, endCommitID string) (in
AddDynamicArguments(startCommitID + "..." + endCommitID).
WithDir(repo.Path).
RunStdString(repo.Ctx)
if err != nil && strings.Contains(err.Error(), "no merge base") {
if err != nil && strings.Contains(err.Stderr(), "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 = gitcmd.NewCommand("diff", "--name-only").
@ -301,7 +301,7 @@ func (repo *Repository) FilesCountBetween(startCommitID, endCommitID string) (in
// If before is detached (removed by reset + push) it is not included.
func (repo *Repository) CommitsBetween(last, before *Commit) ([]*Commit, error) {
var stdout []byte
var err error
var err gitcmd.RunStdError
if before == nil {
stdout, _, err = gitcmd.NewCommand("rev-list").
AddDynamicArguments(last.ID.String()).
@ -312,7 +312,7 @@ func (repo *Repository) CommitsBetween(last, before *Commit) ([]*Commit, error)
AddDynamicArguments(before.ID.String() + ".." + last.ID.String()).
WithDir(repo.Path).
RunStdBytes(repo.Ctx)
if err != nil && strings.Contains(err.Error(), "no merge base") {
if err != nil && strings.Contains(err.Stderr(), "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 = gitcmd.NewCommand("rev-list").
@ -330,7 +330,7 @@ func (repo *Repository) CommitsBetween(last, before *Commit) ([]*Commit, error)
// CommitsBetweenLimit returns a list that contains at most limit commits skipping the first skip commits between [before, last)
func (repo *Repository) CommitsBetweenLimit(last, before *Commit, limit, skip int) ([]*Commit, error) {
var stdout []byte
var err error
var err gitcmd.RunStdError
if before == nil {
stdout, _, err = gitcmd.NewCommand("rev-list").
AddOptionValues("--max-count", strconv.Itoa(limit)).
@ -345,7 +345,7 @@ func (repo *Repository) CommitsBetweenLimit(last, before *Commit, limit, skip in
AddDynamicArguments(before.ID.String() + ".." + last.ID.String()).
WithDir(repo.Path).
RunStdBytes(repo.Ctx)
if err != nil && strings.Contains(err.Error(), "no merge base") {
if err != nil && strings.Contains(err.Stderr(), "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 = gitcmd.NewCommand("rev-list").
@ -366,7 +366,7 @@ func (repo *Repository) CommitsBetweenLimit(last, before *Commit, limit, skip in
// If before is detached (removed by reset + push) it is not included.
func (repo *Repository) CommitsBetweenNotBase(last, before *Commit, baseBranch string) ([]*Commit, error) {
var stdout []byte
var err error
var err gitcmd.RunStdError
if before == nil {
stdout, _, err = gitcmd.NewCommand("rev-list").
AddDynamicArguments(last.ID.String()).
@ -379,7 +379,7 @@ func (repo *Repository) CommitsBetweenNotBase(last, before *Commit, baseBranch s
AddOptionValues("--not", baseBranch).
WithDir(repo.Path).
RunStdBytes(repo.Ctx)
if err != nil && strings.Contains(err.Error(), "no merge base") {
if err != nil && strings.Contains(err.Stderr(), "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 = gitcmd.NewCommand("rev-list").

2
modules/git/repo_commit_nogogit.go
View File

@ -21,7 +21,7 @@ func (repo *Repository) ResolveReference(name string) (string, error) {
WithDir(repo.Path).
RunStdString(repo.Ctx)
if err != nil {
if strings.Contains(err.Error(), "not a valid ref") {
if strings.Contains(err.Stderr(), "not a valid ref") {
return "", ErrNotExist{name, ""}
}
return "", err

2
modules/git/tree_nogogit.go
View File

@ -65,7 +65,7 @@ func (t *Tree) ListEntries() (Entries, error) {
stdout, _, runErr := gitcmd.NewCommand("ls-tree", "-l").AddDynamicArguments(t.ID.String()).WithDir(t.repo.Path).RunStdBytes(t.repo.Ctx)
if runErr != nil {
if gitcmd.IsStdErrorNotValidObjectName(runErr) || strings.Contains(runErr.Error(), "fatal: not a tree object") {
if gitcmd.IsStdErrorNotValidObjectName(runErr) || strings.Contains(runErr.Stderr(), "fatal: not a tree object") {
return nil, ErrNotExist{
ID: t.ID.String(),
}