1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-23 00:39:13 +02:00

fix backward compatibility

This commit is contained in:
Ryooooooga
2021-08-04 18:43:34 +09:00
parent 67cc65930a
commit ac609bd37c
11 changed files with 40 additions and 46 deletions

View File

@ -323,7 +323,7 @@ func (c *GitCommand) ResetAndClean() error {
}
func (c *GitCommand) EditFileCmdStr(filename string, lineNumber int) (string, error) {
editor := c.Config.GetUserConfig().OS.Editor
editor := c.Config.GetUserConfig().OS.EditCommand
if editor == "" {
editor = c.GetConfigValue("core.editor")
@ -353,6 +353,6 @@ func (c *GitCommand) EditFileCmdStr(filename string, lineNumber int) (string, er
"line": strconv.Itoa(lineNumber),
}
editTemplate := c.Config.GetUserConfig().OS.EditCommand
return utils.ResolvePlaceholderString(editTemplate, templateValues), nil
editCmdTemplate := c.Config.GetUserConfig().OS.EditCommandTemplate
return utils.ResolvePlaceholderString(editCmdTemplate, templateValues), nil
}