fix: Allow source dir to be a git worktree

pkg/chezmoi/sourcestate.go

@@ -329,7 +329,7 @@ func (s *SourceState) Add(
 	newSourceStateEntriesByTargetRelPath := make(map[RelPath]SourceStateEntry)
 	nonEmptyDirs := make(map[SourceRelPath]struct{})
 	dirRenames := make(map[AbsPath]AbsPath)
-DESTABSPATH:
+DEST_ABS_PATH:
 	for _, destAbsPath := range destAbsPaths {
 		destAbsPathInfo := destAbsPathInfos[destAbsPath]
 		if !options.Filter.IncludeFileInfo(destAbsPathInfo) {
@@ -374,7 +374,7 @@ DESTABSPATH:
 		if options.PreAddFunc != nil {
 			switch err := options.PreAddFunc(targetRelPath); {
 			case errors.Is(err, Skip):
-				continue DESTABSPATH
+				continue DEST_ABS_PATH
 			case err != nil:
 				return err
 			}
@@ -398,7 +398,7 @@ DESTABSPATH:
 				if options.ReplaceFunc != nil {
 					switch err := options.ReplaceFunc(targetRelPath, newSourceStateEntry, oldSourceStateEntry); {
 					case errors.Is(err, Skip):
-						continue DESTABSPATH
+						continue DEST_ABS_PATH
 					case err != nil:
 						return err
 					}
@@ -413,7 +413,7 @@ DESTABSPATH:
 					oldSourceAbsPath := s.sourceDirAbsPath.Join(oldSourceEntryRelPath.RelPath())
 					newSourceAbsPath := s.sourceDirAbsPath.Join(sourceEntryRelPath.RelPath())
 					dirRenames[oldSourceAbsPath] = newSourceAbsPath
-					continue DESTABSPATH
+					continue DEST_ABS_PATH
 				}
 
 				// Otherwise, remove the old entry.

pkg/cmd/annotation.go

@@ -17,7 +17,7 @@ var (
 
 // Persistent state modes.
 const (
-	persistentStateModeKey = "chezoi_persistent_state_mode"
+	persistentStateModeKey = "chezmoi_persistent_state_mode"
 
 	persistentStateModeEmpty         persistentStateMode = "empty"
 	persistentStateModeReadOnly      persistentStateMode = "read-only"

pkg/cmd/bitwardentemplatefuncs.go

@@ -14,8 +14,8 @@ type bitwardenConfig struct {
 	outputCache map[string][]byte
 }
 
-func (c *Config) bitwardenAttachmentTemplateFunc(name, itemid string) string {
-	output, err := c.bitwardenOutput([]string{"get", "attachment", name, "--itemid", itemid, "--raw"})
+func (c *Config) bitwardenAttachmentTemplateFunc(name, itemID string) string {
+	output, err := c.bitwardenOutput([]string{"get", "attachment", name, "--itemid", itemID, "--raw"})
 	if err != nil {
 		panic(err)
 	}

pkg/cmd/config.go

@@ -1876,7 +1876,7 @@ func (c *Config) persistentPreRunRootE(cmd *cobra.Command, args []string) error
 	FOR:
 		for {
 			gitDirAbsPath := workingTreeAbsPath.JoinString(gogit.GitDirName)
-			if fileInfo, err := c.baseSystem.Stat(gitDirAbsPath); err == nil && fileInfo.IsDir() {
+			if _, err := c.baseSystem.Stat(gitDirAbsPath); err == nil {
 				c.WorkingTreeAbsPath = workingTreeAbsPath
 				break FOR
 			}

pkg/cmd/editcmd.go

@@ -90,7 +90,7 @@ func (c *Config) runEditCmd(cmd *cobra.Command, args []string) error {
 		decryptedAbsPath chezmoi.AbsPath
 	}
 	var transparentlyDecryptedFiles []transparentlyDecryptedFile
-TARGETRELPATH:
+TARGET_REL_PATH:
 	for _, targetRelPath := range targetRelPaths {
 		sourceStateEntry := sourceState.MustEntry(targetRelPath)
 		sourceRelPath := sourceStateEntry.SourceRelPath()
@@ -154,7 +154,7 @@ TARGETRELPATH:
 			}
 			if err := c.baseSystem.Link(c.SourceDirAbsPath.Join(sourceRelPath.RelPath()), hardlinkAbsPath); err == nil {
 				editorArgs = append(editorArgs, hardlinkAbsPath.String())
-				continue TARGETRELPATH
+				continue TARGET_REL_PATH
 			}
 
 			// Otherwise, fall through to the default option of editing the

pkg/cmd/forgetcmd.go

@@ -35,7 +35,7 @@ func (c *Config) runForgetCmd(cmd *cobra.Command, args []string, sourceState *ch
 		return err
 	}
 
-TARGETRELPATH:
+TARGET_REL_PATH:
 	for _, targetRelPath := range targetRelPaths {
 		sourceStateEntry := sourceState.MustEntry(targetRelPath)
 
@@ -46,10 +46,10 @@ TARGETRELPATH:
 			// OK, keep going.
 		case chezmoi.SourceStateOriginRemove:
 			c.errorf("warning: %s: cannot forget entry from remove\n", targetRelPath)
-			continue TARGETRELPATH
+			continue TARGET_REL_PATH
 		case *chezmoi.External:
 			c.errorf("warning: %s: cannot forget entry from external %s\n", targetRelPath, sourceStateOrigin.OriginString())
-			continue TARGETRELPATH
+			continue TARGET_REL_PATH
 		default:
 			panic(fmt.Sprintf("%s: %T: unknown source state origin type", targetRelPath, sourceStateOrigin))
 		}

pkg/cmd/initcmd.go

@@ -137,10 +137,7 @@ func (c *Config) runInitCmd(cmd *cobra.Command, args []string) error {
 
 	// If we're not in a working tree then init it or clone it.
 	gitDirAbsPath := c.WorkingTreeAbsPath.JoinString(git.GitDirName)
-	switch fileInfo, err := c.baseSystem.Stat(gitDirAbsPath); {
-	case err == nil && fileInfo.IsDir():
-	case err == nil && !fileInfo.IsDir():
-		return fmt.Errorf("%s: not a directory", gitDirAbsPath)
+	switch _, err := c.baseSystem.Stat(gitDirAbsPath); {
 	case errors.Is(err, fs.ErrNotExist):
 		workingTreeRawPath, err := c.baseSystem.RawPath(c.WorkingTreeAbsPath)
 		if err != nil {

pkg/cmd/readdcmd.go

@@ -50,7 +50,7 @@ func (c *Config) runReAddCmd(cmd *cobra.Command, args []string, sourceState *che
 	})
 	sort.Sort(targetRelPaths)
 
-TARGETRELPATH:
+TARGET_REL_PATH:
 	for _, targetRelPath := range targetRelPaths {
 		sourceStateFile, ok := sourceStateEntries[targetRelPath].(*chezmoi.SourceStateFile)
 		if !ok {
@@ -118,7 +118,7 @@ TARGETRELPATH:
 				case choice == "yes":
 					break FOR
 				case choice == "no":
-					continue TARGETRELPATH
+					continue TARGET_REL_PATH
 				case choice == "all":
 					c.interactive = false
 					break FOR

pkg/cmd/testdata/scripts/issue2628.txtar

@@ -6,7 +6,7 @@ cmp $HOME/.file golden/.file
 
 chhome home2/user
 
-# test that .chezmoignore.tmpl is read
+# test that .chezmoiignore.tmpl is read
 exec chezmoi apply
 ! exists $HOME/.file
 

pkg/cmd/util.go

@@ -111,8 +111,8 @@ func pluralize(singular string) string {
 	return singular + "s"
 }
 
-// titleize returns s with its first rune titleized.
-func titleize(s string) string {
+// titleFirst returns s with its first rune converted to title case.
+func titleFirst(s string) string {
 	if s == "" {
 		return s
 	}
@@ -128,7 +128,7 @@ func upperSnakeCaseToCamelCase(s string) string {
 		if i == 0 {
 			words[i] = strings.ToLower(word)
 		} else if !isWellKnownAbbreviation(word) {
-			words[i] = titleize(strings.ToLower(word))
+			words[i] = titleFirst(strings.ToLower(word))
 		}
 	}
 	return strings.Join(words, "")