From 36d6450977e40d8ea994590e3c9fd60184fe93e4 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Mon, 5 Jun 2017 00:10:53 -0400 Subject: repo/pull: detect case when no merge base found (#4434) --- vendor/github.com/gogits/git-module/error.go | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'vendor/github.com/gogits/git-module/error.go') 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" +} -- cgit v1.2.3