fix wrong commit id error

a1012112796 · Aug 24, 2020 · a5fcf91 · a5fcf91
1 parent a9fa07e
commit a5fcf91
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/services/pull/merge.go b/services/pull/merge.go
@@ -613,6 +613,9 @@ func MergedManually(pr *models.PullRequest, doer *models.User, baseGitRepo *git.
 
 	commit, err := baseGitRepo.GetCommit(commitID)
 	if err != nil {
+		if git.IsErrNotExist(err) {
+			return fmt.Errorf("Wrong commit ID")
+		}
 		return
 	}