From 755e02f4628abc5ddf40ccf8651d53dfadc9cff1 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Sun, 19 Jun 2022 20:31:17 +0000 Subject: [PATCH] fix: Don't return an error when the user chooses quit from a prompt --- pkg/cmd/addcmd.go | 2 +- pkg/cmd/config.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/cmd/addcmd.go b/pkg/cmd/addcmd.go index 1ddd61a4ca3..6665dfab659 100644 --- a/pkg/cmd/addcmd.go +++ b/pkg/cmd/addcmd.go @@ -123,7 +123,7 @@ func (c *Config) defaulReplaceFunc( case choice == "no": return chezmoi.Skip case choice == "quit": - return chezmoi.ExitCodeError(1) + return chezmoi.ExitCodeError(0) case choice == "yes": return nil default: diff --git a/pkg/cmd/config.go b/pkg/cmd/config.go index 7da5874f30a..2b5d89bb717 100644 --- a/pkg/cmd/config.go +++ b/pkg/cmd/config.go @@ -876,9 +876,9 @@ func (c *Config) defaultPreApplyFunc( case choice == "skip": return chezmoi.Skip case choice == "quit": - return chezmoi.ExitCodeError(1) + return chezmoi.ExitCodeError(0) default: - return nil + panic(fmt.Sprintf("%s: unexpected choice", choice)) } } }