mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-11 20:36:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix the "Add to .git/info/exclude" command in submodules or worktrees

Browse source
This commit is contained in:
Stefan Haller 2024-03-25 14:41:51 +01:00
parent de52a68b53
commit 93251db67e
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pkg/commands/git_commands/working_tree.go
View file

@ -3,6 +3,7 @@ package git_commands
import (
"fmt"
"os"
"path"
"github.com/go-errors/errors"
"github.com/jesseduffield/lazygit/pkg/commands/models"
@ -232,7 +233,8 @@ func (self *WorkingTreeCommands) Ignore(filename string) error {
// Exclude adds a file to the .git/info/exclude for the repo
func (self *WorkingTreeCommands) Exclude(filename string) error {
return self.os.AppendLineToFile(".git/info/exclude", filename)
excludeFile := path.Join(self.repoPaths.repoGitDirPath, "info", "exclude")
return self.os.AppendLineToFile(excludeFile, filename)
}
// WorktreeFileDiff returns the diff of a file

7
pkg/integration/tests/worktree/exclude_file_in_worktree.go
View file

@ -34,13 +34,8 @@ var ExcludeFileInWorktree = NewIntegrationTest(NewIntegrationTestArgs{
Tap(func() {
t.ExpectPopup().Menu().Title(Equals("Ignore or exclude file")).Select(Contains("Add to .git/info/exclude")).Confirm()
}).
/* EXPECTED:
IsEmpty()
t.FileSystem().FileContent("../repo/.git/info/exclude", Contains("toExclude"))
ACTUAL: */
Tap(func() {
t.ExpectPopup().Alert().Title(Equals("Error")).Content(Contains("open .git/info/exclude: not a directory"))
})
t.FileSystem().FileContent("../repo/.git/info/exclude", Contains("toExclude"))
},
})