Merge pull request #743 from twpayne/fix-740

cmd/diff.go

@@ -49,7 +49,7 @@ func (c *Config) runDiffCmd(cmd *cobra.Command, args []string) error {
 	case "chezmoi":
 		c.mutator = chezmoi.NullMutator{}
 	case "git":
-		c.mutator = chezmoi.NewFSMutator(vfs.NewReadOnlyFS(config.fs))
+		c.mutator = chezmoi.NewFSMutator(vfs.NewReadOnlyFS(c.fs))
 	default:
 		return fmt.Errorf("unknown diff format: %q", c.Diff.Format)
 	}

cmd/diff_test.go

@@ -0,0 +1,31 @@
+package cmd
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"github.com/twpayne/go-vfs/vfst"
+)
+
+func TestIssue740(t *testing.T) {
+	fs, cleanup, err := vfst.NewTestFS(map[string]interface{}{
+		"/home/user": map[string]interface{}{
+			"dir": map[string]interface{}{
+				"foo": "foo",
+			},
+			".local/share/chezmoi": map[string]interface{}{
+				"exact_dir": map[string]interface{}{
+					"foo": "foo",
+					"bar": "bar",
+				},
+			},
+		},
+	})
+	require.NoError(t, err)
+	defer cleanup()
+
+	c := newTestConfig(fs)
+	c.Diff.Format = "git"
+	assert.NoError(t, c.runDiffCmd(nil, nil))
+}

internal/chezmoi/gitdiffmutator.go

@@ -192,7 +192,9 @@ func (m *GitDiffMutator) WriteSymlink(oldname, newname string) error {
 
 func (m *GitDiffMutator) getFileMode(name string) (filemode.FileMode, os.FileInfo, error) {
 	info, err := m.m.Stat(name)
-	if err != nil {
+	if os.IsNotExist(err) {
+		return filemode.Empty, nil, nil
+	} else if err != nil {
 		return filemode.Empty, nil, err
 	}
 	fileMode, err := filemode.NewFromOSFileMode(info.Mode())