summaryrefslogtreecommitdiffstats
path: root/pkg/commands/files.go
diff options
context:
space:
mode:
authorRyooooooga <eial5q265e5@gmail.com>2021-08-04 18:43:34 +0900
committerRyooooooga <eial5q265e5@gmail.com>2021-08-04 18:43:34 +0900
commitac609bd37c0b879ce08f0fcff7b1c7ef09d37333 (patch)
treee402ef4ca8af9929d0c9e1f9caa18ea25d34bb18 /pkg/commands/files.go
parent67cc65930ae62346fcc522f56da59fba5eef1dbe (diff)
fix backward compatibility
Diffstat (limited to 'pkg/commands/files.go')
-rw-r--r--pkg/commands/files.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/commands/files.go b/pkg/commands/files.go
index 1d4ad5fe6..fed1e795c 100644
--- a/pkg/commands/files.go
+++ b/pkg/commands/files.go
@@ -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
}