Skip to content

Commit 2f89a04

Browse files
lunnylunny
committed
Fix bug
1 parent 2e69ad3 commit 2f89a04

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

‎routers/api/v1/repo/pull.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1201,7 +1201,7 @@ func parseCompareInfo(ctx *context.APIContext, form api.CreatePullRequestOption)
12011201
return nil, nil
12021202
}
12031203

1204-
compareInfo, err := pull_service.GetCompareInfo(ctx, baseRepo, headGitRepo, baseRef.ShortName(), headRef.ShortName(), false, false)
1204+
compareInfo, err := pull_service.GetCompareInfo(ctx, baseRepo, headRepo, headGitRepo, baseRef.ShortName(), headRef.ShortName(), false, false)
12051205
if err != nil {
12061206
ctx.APIErrorInternal(err)
12071207
return nil, nil
@@ -1461,9 +1461,9 @@ func GetPullRequestCommits(ctx *context.APIContext) {
14611461
defer closer.Close()
14621462

14631463
if pr.HasMerged {
1464-
prInfo, err = pull_service.GetCompareInfo(ctx, pr.BaseRepo, baseGitRepo, pr.MergeBase, pr.GetGitHeadRefName(), false, false)
1464+
prInfo, err = pull_service.GetCompareInfo(ctx, pr.BaseRepo, pr.BaseRepo, baseGitRepo, pr.MergeBase, pr.GetGitHeadRefName(), false, false)
14651465
} else {
1466-
prInfo, err = pull_service.GetCompareInfo(ctx, pr.BaseRepo, baseGitRepo, pr.BaseBranch, pr.GetGitHeadRefName(), false, false)
1466+
prInfo, err = pull_service.GetCompareInfo(ctx, pr.BaseRepo, pr.BaseRepo, baseGitRepo, pr.BaseBranch, pr.GetGitHeadRefName(), false, false)
14671467
}
14681468
if err != nil {
14691469
ctx.APIErrorInternal(err)
@@ -1584,9 +1584,9 @@ func GetPullRequestFiles(ctx *context.APIContext) {
15841584

15851585
var prInfo *pull_service.CompareInfo
15861586
if pr.HasMerged {
1587-
prInfo, err = pull_service.GetCompareInfo(ctx, pr.BaseRepo, baseGitRepo, pr.MergeBase, pr.GetGitHeadRefName(), true, false)
1587+
prInfo, err = pull_service.GetCompareInfo(ctx, pr.BaseRepo, pr.BaseRepo, baseGitRepo, pr.MergeBase, pr.GetGitHeadRefName(), true, false)
15881588
} else {
1589-
prInfo, err = pull_service.GetCompareInfo(ctx, pr.BaseRepo, baseGitRepo, pr.BaseBranch, pr.GetGitHeadRefName(), true, false)
1589+
prInfo, err = pull_service.GetCompareInfo(ctx, pr.BaseRepo, pr.BaseRepo, baseGitRepo, pr.BaseBranch, pr.GetGitHeadRefName(), true, false)
15901590
}
15911591
if err != nil {
15921592
ctx.APIErrorInternal(err)

‎routers/web/repo/compare.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@ func ParseCompareInfo(ctx *context.Context) *common.CompareInfo {
551551
headBranchRef = git.TagPrefix + ci.HeadBranch
552552
}
553553

554-
ci.CompareInfo, err = pull_service.GetCompareInfo(ctx, baseRepo, ci.HeadGitRepo, baseBranchRef, headBranchRef, ci.DirectComparison, fileOnly)
554+
ci.CompareInfo, err = pull_service.GetCompareInfo(ctx, baseRepo, ci.HeadRepo, ci.HeadGitRepo, baseBranchRef, headBranchRef, ci.DirectComparison, fileOnly)
555555
if err != nil {
556556
ctx.ServerError("GetCompareInfo", err)
557557
return nil

‎routers/web/repo/pull.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ func prepareMergedViewPullInfo(ctx *context.Context, issue *issues_model.Issue)
273273

274274
baseCommit := GetMergedBaseCommitID(ctx, issue)
275275

276-
compareInfo, err := pull_service.GetCompareInfo(ctx, ctx.Repo.Repository, ctx.Repo.GitRepo,
276+
compareInfo, err := pull_service.GetCompareInfo(ctx, ctx.Repo.Repository, ctx.Repo.Repository, ctx.Repo.GitRepo,
277277
baseCommit, pull.GetGitHeadRefName(), false, false)
278278
if err != nil {
279279
if strings.Contains(err.Error(), "fatal: Not a valid object name") || strings.Contains(err.Error(), "unknown revision or path not in the working tree") {
@@ -373,7 +373,7 @@ func prepareViewPullInfo(ctx *context.Context, issue *issues_model.Issue) *pull_
373373
ctx.Data["LatestCommitStatus"] = git_model.CalcCommitStatus(commitStatuses)
374374
}
375375

376-
compareInfo, err := pull_service.GetCompareInfo(ctx, pull.BaseRepo, baseGitRepo,
376+
compareInfo, err := pull_service.GetCompareInfo(ctx, pull.BaseRepo, pull.BaseRepo, baseGitRepo,
377377
pull.MergeBase, pull.GetGitHeadRefName(), false, false)
378378
if err != nil {
379379
if strings.Contains(err.Error(), "fatal: Not a valid object name") {
@@ -521,7 +521,7 @@ func prepareViewPullInfo(ctx *context.Context, issue *issues_model.Issue) *pull_
521521
}
522522
}
523523

524-
compareInfo, err := pull_service.GetCompareInfo(ctx, pull.BaseRepo, baseGitRepo,
524+
compareInfo, err := pull_service.GetCompareInfo(ctx, pull.BaseRepo, pull.BaseRepo, baseGitRepo,
525525
git.BranchPrefix+pull.BaseBranch, pull.GetGitHeadRefName(), false, false)
526526
if err != nil {
527527
if strings.Contains(err.Error(), "fatal: Not a valid object name") {

‎services/pull/compare.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,21 @@ type CompareInfo struct {
2525
}
2626

2727
// GetCompareInfo generates and returns compare information between base and head branches of repositories.
28-
func GetCompareInfo(ctx context.Context, baseRepo *repo_model.Repository, headGitRepo *git.Repository, baseBranch, headBranch string, directComparison, fileOnly bool) (_ *CompareInfo, err error) {
28+
func GetCompareInfo(ctx context.Context, baseRepo, headRepo *repo_model.Repository, headGitRepo *git.Repository, baseBranch, headBranch string, directComparison, fileOnly bool) (_ *CompareInfo, err error) {
2929
var (
3030
remoteBranch string
3131
tmpRemote string
3232
)
3333

3434
// We don't need a temporary remote for same repository.
35-
if baseRepo.RepoPath() != headGitRepo.Path {
35+
if headGitRepo.Path != baseRepo.RepoPath() {
3636
// Add a temporary remote
3737
tmpRemote = strconv.FormatInt(time.Now().UnixNano(), 10)
38-
if err = gitrepo.AddGitRemote(ctx, baseRepo, tmpRemote, headGitRepo.Path); err != nil {
38+
if err = gitrepo.AddGitRemote(ctx, headRepo, tmpRemote, baseRepo.RepoPath()); err != nil {
3939
return nil, fmt.Errorf("AddRemote: %w", err)
4040
}
4141
defer func() {
42-
if err := gitrepo.RemoveGitRemote(ctx, baseRepo, tmpRemote); err != nil {
42+
if err := gitrepo.RemoveGitRemote(ctx, headRepo, tmpRemote); err != nil {
4343
logger.Error("GetPullRequestInfo: RemoveGitRemote: %v", err)
4444
}
4545
}()

‎services/pull/pull.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ func NewPullRequest(ctx context.Context, opts *NewPullRequestOptions) error {
142142
return err
143143
}
144144

145-
compareInfo, err := GetCompareInfo(ctx, pr.BaseRepo, baseGitRepo,
145+
compareInfo, err := GetCompareInfo(ctx, pr.BaseRepo, pr.BaseRepo, baseGitRepo,
146146
git.BranchPrefix+pr.BaseBranch, pr.GetGitHeadRefName(), false, false)
147147
if err != nil {
148148
return err
@@ -1077,7 +1077,7 @@ func GetPullCommits(ctx *gitea_context.Context, issue *issues_model.Issue) ([]Co
10771077
if pull.HasMerged {
10781078
baseBranch = pull.MergeBase
10791079
}
1080-
prInfo, err := GetCompareInfo(ctx, pull.BaseRepo, baseGitRepo, baseBranch, pull.GetGitHeadRefName(), true, false)
1080+
prInfo, err := GetCompareInfo(ctx, pull.BaseRepo, pull.BaseRepo, baseGitRepo, baseBranch, pull.GetGitHeadRefName(), true, false)
10811081
if err != nil {
10821082
return nil, "", err
10831083
}

0 commit comments

Comments
 (0)