fix: Fix apply --verbose when diff.command is set

twpayne · Apr 9, 2022 · 58c458c · 58c458c
1 parent 0ed7772
commit 58c458c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/pkg/chezmoi/externaldiffsystem.go b/pkg/chezmoi/externaldiffsystem.go
@@ -174,7 +174,10 @@ func (s *ExternalDiffSystem) WriteFile(filename AbsPath, data []byte, perm fs.Fi
 	if err := os.WriteFile(targetAbsPath.String(), data, perm); err != nil {
 		return err
 	}
-	return s.runDiffCommand(filename, targetAbsPath)
+	if err := s.runDiffCommand(filename, targetAbsPath); err != nil {
+		return err
+	}
+	return s.system.WriteFile(filename, data, perm)
 }
 
 // WriteSymlink implements System.WriteSymlink.

diff --git a/pkg/cmd/testdata/scripts/diffcommand_unix.txt b/pkg/cmd/testdata/scripts/diffcommand_unix.txt
@@ -25,6 +25,7 @@ stdout ^arg\s+${HOME@R}/\.file\s+${WORK@R}/.*/\.file$
 # test that chezmoi apply --verbose uses diff.command
 chezmoi apply --verbose
 stdout ^arg\s+${HOME@R}/\.file\s+${WORK@R}/.*/\.file$
+exists $HOME/.file
 
 chhome home3/user