mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2025-06-09 16:17:40 +00:00
[mod]: Bump gopkg.in/src-d/go-git.v4 from 4.8.0 to 4.10.0 (#6662)
Bumps [gopkg.in/src-d/go-git.v4](https://github.com/src-d/go-git) from 4.8.0 to 4.10.0. - [Release notes](https://github.com/src-d/go-git/releases) - [Commits](https://github.com/src-d/go-git/compare/v4.8.0...v4.10.0)
This commit is contained in:
parent
62b35964e3
commit
4183c846e3
28 changed files with 597 additions and 189 deletions
11
vendor/gopkg.in/src-d/go-git.v4/worktree.go
generated
vendored
11
vendor/gopkg.in/src-d/go-git.v4/worktree.go
generated
vendored
|
@ -25,10 +25,11 @@ import (
|
|||
)
|
||||
|
||||
var (
|
||||
ErrWorktreeNotClean = errors.New("worktree is not clean")
|
||||
ErrSubmoduleNotFound = errors.New("submodule not found")
|
||||
ErrUnstagedChanges = errors.New("worktree contains unstaged changes")
|
||||
ErrGitModulesSymlink = errors.New(gitmodulesFile + " is a symlink")
|
||||
ErrWorktreeNotClean = errors.New("worktree is not clean")
|
||||
ErrSubmoduleNotFound = errors.New("submodule not found")
|
||||
ErrUnstagedChanges = errors.New("worktree contains unstaged changes")
|
||||
ErrGitModulesSymlink = errors.New(gitmodulesFile + " is a symlink")
|
||||
ErrNonFastForwardUpdate = errors.New("non-fast-forward update")
|
||||
)
|
||||
|
||||
// Worktree represents a git worktree.
|
||||
|
@ -101,7 +102,7 @@ func (w *Worktree) PullContext(ctx context.Context, o *PullOptions) error {
|
|||
}
|
||||
|
||||
if !ff {
|
||||
return fmt.Errorf("non-fast-forward update")
|
||||
return ErrNonFastForwardUpdate
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue