go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2024-12-02 09:21:40 +02:00
Code Issues Releases Activity

support nuking all submodules

Browse Source
This commit is contained in:
Jesse Duffield 2020-09-29 08:47:14 +10:00
parent b8da166ab1
commit b882ac9e06
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/commands/git.go
View File

@ -375,6 +375,23 @@ func includesInt(list []int, a int) bool {
// ResetAndClean removes all unstaged changes and removes all untracked files
func (c *GitCommand) ResetAndClean() error {
submoduleConfigs, err := c.GetSubmoduleConfigs()
if err != nil {
return err
}
if len(submoduleConfigs) > 0 {
for _, config := range submoduleConfigs {
if err := c.SubmoduleStash(config); err != nil {
return err
}
}
if err := c.SubmoduleUpdateAll(); err != nil {
return err
}
}
if err := c.ResetHard("HEAD"); err != nil {
return err
}

11
pkg/commands/submodules.go
View File

@ -58,9 +58,20 @@ func (c *GitCommand) GetSubmoduleConfigs() ([]*SubmoduleConfig, error) {
}
func (c *GitCommand) SubmoduleStash(config *SubmoduleConfig) error {
// if the path does not exist then it hasn't yet been initialized so we'll swallow the error
// because the intention here is to have no dirty worktree state
if _, err := os.Stat(config.Path); os.IsNotExist(err) {
c.Log.Infof("submodule path %s does not exist, returning", config.Path)
return nil
}
return c.OSCommand.RunCommand("git -C %s stash --include-untracked", config.Path)
}
func (c *GitCommand) SubmoduleReset(config *SubmoduleConfig) error {
return c.OSCommand.RunCommand("git submodule update --force %s", config.Name)
}
func (c *GitCommand) SubmoduleUpdateAll() error {
return c.OSCommand.RunCommand("git submodule update --force")
}