fix: Fix forget command on implicitly managed files

Author: twpayne

internal/cmd/destroycmd.go

@@ -63,7 +63,7 @@ func (c *Config) runDestroyCmd(cmd *cobra.Command, args []string, sourceState *c
 		var sourceAbsPath chezmoi.AbsPath
 		sourceStateEntry := sourceState.MustEntry(targetRelPath)
 		if sourceStateEntry.Origin().IsExternal() {
-			c.errorf("warning: skipping external %s", targetRelPath)
+			c.errorf("warning: skipping external %s\n", targetRelPath)
 			continue
 		}
 		if _, ok := sourceStateEntry.(*chezmoi.SourceStateRemove); !ok {

internal/cmd/forgetcmd.go

@@ -34,7 +34,6 @@ func (c *Config) runForgetCmd(cmd *cobra.Command, args []string, sourceState *ch
 		return err
 	}
 
-TARGET_REL_PATH:
 	for _, targetRelPath := range targetRelPaths {
 		sourceStateEntry := sourceState.MustEntry(targetRelPath)
 
@@ -45,15 +44,21 @@ TARGET_REL_PATH:
 			// OK, keep going.
 		case chezmoi.SourceStateOriginRemove:
 			c.errorf("warning: %s: cannot forget entry from remove\n", targetRelPath)
-			continue TARGET_REL_PATH
+			continue
 		case *chezmoi.External:
 			c.errorf("warning: %s: cannot forget entry from external %s\n", targetRelPath, sourceStateOrigin.OriginString())
-			continue TARGET_REL_PATH
+			continue
 		default:
 			panic(fmt.Sprintf("%s: %T: unknown source state origin type", targetRelPath, sourceStateOrigin))
 		}
 
-		sourceAbsPath := c.SourceDirAbsPath.Join(sourceStateEntry.SourceRelPath().RelPath())
+		relPath := sourceStateEntry.SourceRelPath().RelPath()
+		if relPath.IsEmpty() {
+			c.errorf("warning: %s: ignoring implicitly managed file\n", targetRelPath)
+			continue
+		}
+
+		sourceAbsPath := c.SourceDirAbsPath.Join(relPath)
 		if !c.force {
 			choice, err := c.promptChoice(fmt.Sprintf("Remove %s", sourceAbsPath), choicesYesNoAllQuit)
 			if err != nil {

internal/cmd/testdata/scripts/issue4787.txtar

@@ -0,0 +1,11 @@
+# test that chezmoi forget on a file in an exact_ directory does not delete the source directory
+exec chezmoi forget --debug --force $HOME${/}.dir${/}file2
+stderr 'warning: .dir/file2: ignoring implicitly managed file'
+exists $CHEZMOISOURCEDIR
+
+-- home/user/.dir/file1 --
+# contents of .dir/file1
+-- home/user/.dir/file2 --
+# contents of .dir/file2
+-- home/user/.local/share/chezmoi/exact_dot_dir/file1 --
+# contents of .dir/file1