mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2025-06-10 16:39:33 +00:00
update go git from v4.10.0 to v4.11.0 (#7096)
This commit is contained in:
parent
fb4438a815
commit
8a343dda39
15 changed files with 93 additions and 40 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
|
@ -152,17 +152,6 @@ func (w *Worktree) Checkout(opts *CheckoutOptions) error {
|
|||
}
|
||||
}
|
||||
|
||||
if !opts.Force {
|
||||
unstaged, err := w.containsUnstagedChanges()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if unstaged {
|
||||
return ErrUnstagedChanges
|
||||
}
|
||||
}
|
||||
|
||||
c, err := w.getCommitFromCheckoutOptions(opts)
|
||||
if err != nil {
|
||||
return err
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue