luckyimnotanigger/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-06-10 16:39:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

update go-git to v4.12.0 - fixes #7248 (#7249)

Browse source
This commit is contained in:
techknowlogick 2019-06-18 22:14:15 -04:00 • committed by Lunny Xiao
parent b209531959
commit 33ad554800
270 changed files with 71049 additions and 14434 deletions
Download patch file Download diff file Expand all files Collapse all files

4
vendor/gopkg.in/src-d/go-git.v4/worktree.go generated vendored
View file

@ -160,6 +160,8 @@ func (w *Worktree) Checkout(opts *CheckoutOptions) error {
ro := &ResetOptions{Commit: c, Mode: MergeReset}
if opts.Force {
ro.Mode = HardReset
} else if opts.Keep {
ro.Mode = SoftReset
}
if !opts.Hash.IsZero() && !opts.Create {
@ -720,7 +722,7 @@ func (w *Worktree) Clean(opts *CleanOptions) error {
func (w *Worktree) doClean(status Status, opts *CleanOptions, dir string, files []os.FileInfo) error {
for _, fi := range files {
if fi.Name() == ".git" {
if fi.Name() == GitDirName {
continue
}