go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-15 01:34:26 +02:00
Code Issues Releases Activity

improved command for deleting a submodule

Browse Source
This commit is contained in:
Jesse Duffield
2020-10-01 07:55:28 +10:00
parent 988176e073
commit f3be2b3e68
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/commands/oscommands/os.go
View File

@ -97,7 +97,11 @@ func (c *OSCommand) RunCommandWithOutput(formatString string, formatArgs ...inte
} }
c.Log.WithField("command", command).Info("RunCommand") c.Log.WithField("command", command).Info("RunCommand")
cmd := c.ExecutableFromString(command) cmd := c.ExecutableFromString(command)
return sanitisedCommandOutput(cmd.CombinedOutput()) output, err := sanitisedCommandOutput(cmd.CombinedOutput())
if err != nil {
c.Log.WithField("command", command).Error(err)
}
return output, err
} }
// RunExecutableWithOutput runs an executable file and returns its output // RunExecutableWithOutput runs an executable file and returns its output

19
pkg/commands/submodules.go
View File

@ -5,6 +5,7 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"regexp" "regexp"
"strings"
"github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/commands/models"
) )
@ -84,10 +85,22 @@ func (c *GitCommand) SubmoduleDelete(submodule *models.SubmoduleConfig) error {
// based on https://gist.github.com/myusuf3/7f645819ded92bda6677 // based on https://gist.github.com/myusuf3/7f645819ded92bda6677
if err := c.OSCommand.RunCommand("git submodule deinit --force %s", submodule.Path); err != nil { if err := c.OSCommand.RunCommand("git submodule deinit --force %s", submodule.Path); err != nil {
return err if strings.Contains(err.Error(), "did not match any file(s) known to git") {
if err := c.OSCommand.RunCommand("git config --file .gitmodules --remove-section submodule.%s", submodule.Name); err != nil {
return err
}
if err := c.OSCommand.RunCommand("git config --remove-section submodule.%s", submodule.Name); err != nil {
return err
}
// if there's an error here about it not existing then we'll just continue to do `git rm`
} else {
return err
}
} }
if err := c.OSCommand.RunCommand("git rm --force %s", submodule.Path); err != nil { if err := c.OSCommand.RunCommand("git rm --force -r %s", submodule.Path); err != nil {
return err return err
} }
@ -109,6 +122,6 @@ func (c *GitCommand) SubmoduleUpdateUrl(name string, path string, newUrl string)
return err return err
} }
return c.OSCommand.RunCommand("git submodule sync -- %s", path) return c.OSCommand.RunCommand("git submodule sync %s", path)
} }