repo/pull: detect case when no merge base found (#4434)

1 files changed, 11 insertions, 0 deletions

diff --git a/vendor/github.com/gogits/git-module/error.go b/vendor/github.com/gogits/git-module/error.go
index 848bfba1..2fefaa1e 100644
--- a/vendor/github.com/gogits/git-module/error.go
+++ b/vendor/github.com/gogits/git-module/error.go
@@ -48,3 +48,14 @@ func IsErrUnsupportedVersion(err error) bool {
 func (err ErrUnsupportedVersion) Error() string {
 	return fmt.Sprintf("Operation requires higher version [required: %s]", err.Required)
 }
+
+type ErrNoMergeBase struct{}
+
+func IsErrNoMergeBase(err error) bool {
+	_, ok := err.(ErrNoMergeBase)
+	return ok
+}
+
+func (err ErrNoMergeBase) Error() string {
+	return "no merge based found"
+}