go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-04-27 12:32:37 +02:00
Code Issues Releases Activity

Pass entire submodule to UpdateUrl instead of name and path separately

Browse Source 
This will make the next commit slightly simpler.
This commit is contained in:
Stefan Haller 2024-02-10 18:07:42 +01:00
parent ea87912a74
commit db4f12929e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/commands/git_commands/submodule.go
View File

@ -158,10 +158,10 @@ func (self *SubmoduleCommands) Add(name string, path string, url string) error {
return self.cmd.New(cmdArgs).Run() return self.cmd.New(cmdArgs).Run()
} }
func (self *SubmoduleCommands) UpdateUrl(name string, path string, newUrl string) error { func (self *SubmoduleCommands) UpdateUrl(submodule *models.SubmoduleConfig, newUrl string) error {
setUrlCmdStr := NewGitCmd("config"). setUrlCmdStr := NewGitCmd("config").
Arg( Arg(
"--file", ".gitmodules", "submodule."+name+".url", newUrl, "--file", ".gitmodules", "submodule."+submodule.Name+".url", newUrl,
). ).
ToArgv() ToArgv()
@ -170,7 +170,7 @@ func (self *SubmoduleCommands) UpdateUrl(name string, path string, newUrl string
return err return err
} }
syncCmdStr := NewGitCmd("submodule").Arg("sync", "--", path). syncCmdStr := NewGitCmd("submodule").Arg("sync", "--", submodule.Path).
ToArgv() ToArgv()
if err := self.cmd.New(syncCmdStr).Run(); err != nil { if err := self.cmd.New(syncCmdStr).Run(); err != nil {

2
pkg/gui/controllers/submodules_controller.go
View File

@ -183,7 +183,7 @@ func (self *SubmodulesController) editURL(submodule *models.SubmoduleConfig) err
HandleConfirm: func(newUrl string) error { HandleConfirm: func(newUrl string) error {
return self.c.WithWaitingStatus(self.c.Tr.UpdatingSubmoduleUrlStatus, func(gocui.Task) error { return self.c.WithWaitingStatus(self.c.Tr.UpdatingSubmoduleUrlStatus, func(gocui.Task) error {
self.c.LogAction(self.c.Tr.Actions.UpdateSubmoduleUrl) self.c.LogAction(self.c.Tr.Actions.UpdateSubmoduleUrl)
err := self.c.Git().Submodule.UpdateUrl(submodule.Name, submodule.Path, newUrl) err := self.c.Git().Submodule.UpdateUrl(submodule, newUrl)
if err != nil { if err != nil {
_ = self.c.Error(err) _ = self.c.Error(err)
} }