summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Haller <stefan@haller-berlin.de>2024-02-10 18:07:42 +0100
committerStefan Haller <stefan@haller-berlin.de>2024-03-07 20:16:28 +0100
commitdb4f12929ec242182e482ee5ab829d463cda6ea5 (patch)
tree43e00165de64c4d13744d4e6d0c400c00fa10250
parentea87912a740464d1c69f4acad9c79efe6588d532 (diff)
Pass entire submodule to UpdateUrl instead of name and path separately
This will make the next commit slightly simpler.
-rw-r--r--pkg/commands/git_commands/submodule.go6
-rw-r--r--pkg/gui/controllers/submodules_controller.go2
2 files changed, 4 insertions, 4 deletions
diff --git a/pkg/commands/git_commands/submodule.go b/pkg/commands/git_commands/submodule.go
index 3f69ce875..b105d57ea 100644
--- a/pkg/commands/git_commands/submodule.go
+++ b/pkg/commands/git_commands/submodule.go
@@ -158,10 +158,10 @@ func (self *SubmoduleCommands) Add(name string, path string, url string) error {
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").
Arg(
- "--file", ".gitmodules", "submodule."+name+".url", newUrl,
+ "--file", ".gitmodules", "submodule."+submodule.Name+".url", newUrl,
).
ToArgv()
@@ -170,7 +170,7 @@ func (self *SubmoduleCommands) UpdateUrl(name string, path string, newUrl string
return err
}
- syncCmdStr := NewGitCmd("submodule").Arg("sync", "--", path).
+ syncCmdStr := NewGitCmd("submodule").Arg("sync", "--", submodule.Path).
ToArgv()
if err := self.cmd.New(syncCmdStr).Run(); err != nil {
diff --git a/pkg/gui/controllers/submodules_controller.go b/pkg/gui/controllers/submodules_controller.go
index 3cf3b5bf5..13496ce73 100644
--- a/pkg/gui/controllers/submodules_controller.go
+++ b/pkg/gui/controllers/submodules_controller.go
@@ -183,7 +183,7 @@ func (self *SubmodulesController) editURL(submodule *models.SubmoduleConfig) err
HandleConfirm: func(newUrl string) error {
return self.c.WithWaitingStatus(self.c.Tr.UpdatingSubmoduleUrlStatus, func(gocui.Task) error {
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 {
_ = self.c.Error(err)
}