closed-social
/
gitea
3
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

Wrong PR merge commit ID saved (#2007)

for-closed-social
Lauris BH 7 years ago
committed by Lunny Xiao
parent
4d2ea7dc41
commit
165cf33771
1 changed files with 1 additions and 1 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      models/pull.go

+ 1
- 1
models/pull.go View File

@ -328,7 +328,7 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository) (err error
return fmt.Errorf("git push: %s", stderr) return fmt.Errorf("git push: %s", stderr)
} }
pr.MergedCommitID, err = headGitRepo.GetBranchCommitID(pr.BaseBranch)
pr.MergedCommitID, err = baseGitRepo.GetBranchCommitID(pr.BaseBranch)
if err != nil { if err != nil {
return fmt.Errorf("GetBranchCommit: %v", err) return fmt.Errorf("GetBranchCommit: %v", err)
} }

Write Preview
Loading…
Cancel
Save