|
|
@ -507,7 +507,9 @@ func (pr *PullRequest) getMergeCommit() (*git.Commit, error) { |
|
|
|
mergeCommit, stderr, err := process.GetManager().ExecDirEnv(-1, "", fmt.Sprintf("isMerged (git rev-list --ancestry-path --merges --reverse): %d", pr.BaseRepo.ID), |
|
|
|
mergeCommit, stderr, err := process.GetManager().ExecDirEnv(-1, "", fmt.Sprintf("isMerged (git rev-list --ancestry-path --merges --reverse): %d", pr.BaseRepo.ID), |
|
|
|
[]string{"GIT_INDEX_FILE=" + indexTmpPath, "GIT_DIR=" + pr.BaseRepo.RepoPath()}, |
|
|
|
[]string{"GIT_INDEX_FILE=" + indexTmpPath, "GIT_DIR=" + pr.BaseRepo.RepoPath()}, |
|
|
|
"git", "rev-list", "--ancestry-path", "--merges", "--reverse", cmd) |
|
|
|
"git", "rev-list", "--ancestry-path", "--merges", "--reverse", cmd) |
|
|
|
|
|
|
|
if err == nil && len(mergeCommit) != 40 { |
|
|
|
|
|
|
|
err = fmt.Errorf("unexpected length of output (got:%d bytes) '%s'", len(mergeCommit), mergeCommit) |
|
|
|
|
|
|
|
} |
|
|
|
if err != nil { |
|
|
|
if err != nil { |
|
|
|
return nil, fmt.Errorf("git rev-list --ancestry-path --merges --reverse: %v %v", stderr, err) |
|
|
|
return nil, fmt.Errorf("git rev-list --ancestry-path --merges --reverse: %v %v", stderr, err) |
|
|
|
} |
|
|
|
} |
|
|
|