fork of go-git with some jj specific features

Merge pull request #1360 from BeChris/issue1176

git: worktree, fix restoring dot slash files. Fixes #1176

authored by Paulo Gomes and committed by GitHub dcfe6eaa 40106c9e

Changed files
+5 -4
+2 -1
worktree.go
··· 432 432 } 433 433 434 434 func inFiles(files []string, v string) bool { 435 + v = filepath.Clean(v) 435 436 for _, s := range files { 436 - if s == v { 437 + if filepath.Clean(s) == v { 437 438 return true 438 439 } 439 440 }
+3 -3
worktree_test.go
··· 1283 1283 s.NoError(err) 1284 1284 s.False(status.IsClean()) 1285 1285 1286 - err = w.Reset(&ResetOptions{Files: []string{"dir/testfile.txt"}, Mode: HardReset}) 1286 + err = w.Reset(&ResetOptions{Files: []string{"./dir/testfile.txt"}, Mode: HardReset}) 1287 1287 s.NoError(err) 1288 1288 1289 1289 status, err = w.Status() ··· 3212 3212 s.ErrorIs(err, ErrNoRestorePaths) 3213 3213 3214 3214 // Restore Staged files in 2 groups and confirm status 3215 - opts.Files = []string{names[0], names[1]} 3215 + opts.Files = []string{names[0], "./" + names[1]} 3216 3216 err = w.Restore(&opts) 3217 3217 s.NoError(err) 3218 3218 verifyStatus(s, "Restored First", w, names, []FileStatus{ ··· 3227 3227 s.NoError(err) 3228 3228 s.Equal("Foo Bar:11", string(contents)) 3229 3229 3230 - opts.Files = []string{names[2], names[3]} 3230 + opts.Files = []string{"./" + names[2], names[3]} 3231 3231 err = w.Restore(&opts) 3232 3232 s.NoError(err) 3233 3233 verifyStatus(s, "Restored Second", w, names, []FileStatus{