mirror of
https://github.com/gogs/gogs.git
synced 2026-06-25 01:01:12 +02:00
repo/pull: detect case when no merge base found (#4434)
This commit is contained in:
11
vendor/github.com/gogits/git-module/error.go
generated
vendored
11
vendor/github.com/gogits/git-module/error.go
generated
vendored
@@ -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"
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user