From 9a7f59ef35ef8130b1f05908ff3f4fcc33be4ee2 Mon Sep 17 00:00:00 2001 From: Ethan Koenig Date: Tue, 11 Jul 2017 10:51:39 -0400 Subject: [PATCH] Fix fast-forward PR bug (#2137) * Fix fast-forward PR bug * Don't ignore error in getMergeCommit (#1843) --- models/pull.go | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/models/pull.go b/models/pull.go index 822822411..7a79dc3f0 100644 --- a/models/pull.go +++ b/models/pull.go @@ -499,9 +499,15 @@ func (pr *PullRequest) getMergeCommit() (*git.Commit, error) { return nil, fmt.Errorf("git merge-base --is-ancestor: %v %v", stderr, err) } - // We can ignore this error since we only get here when there's a valid commit in headFile - commitID, _ := ioutil.ReadFile(pr.BaseRepo.RepoPath() + "/" + headFile) - cmd := string(commitID)[:40] + ".." + pr.BaseBranch + commitIDBytes, err := ioutil.ReadFile(pr.BaseRepo.RepoPath() + "/" + headFile) + if err != nil { + return nil, fmt.Errorf("ReadFile(%s): %v", headFile, err) + } + commitID := string(commitIDBytes) + if len(commitID) < 40 { + return nil, fmt.Errorf(`ReadFile(%s): invalid commit-ID "%s"`, headFile, commitID) + } + cmd := commitID[:40] + ".." + pr.BaseBranch // Get the commit from BaseBranch where the pull request got merged mergeCommit, stderr, err := process.GetManager().ExecDirEnv(-1, "", fmt.Sprintf("isMerged (git rev-list --ancestry-path --merges --reverse): %d", pr.BaseRepo.ID), @@ -510,6 +516,9 @@ func (pr *PullRequest) getMergeCommit() (*git.Commit, error) { if err != nil { return nil, fmt.Errorf("git rev-list --ancestry-path --merges --reverse: %v %v", stderr, err) + } else if len(mergeCommit) < 40 { + // PR was fast-forwarded, so just use last commit of PR + mergeCommit = commitID[:40] } gitRepo, err := git.OpenRepository(pr.BaseRepo.RepoPath())