Fix behavior when adding an empty file without --empty

twpayne · Mar 31, 2020 · bcd0750 · bcd0750
1 parent d6f80bb
commit bcd0750
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/cmd/add_test.go b/cmd/add_test.go
@@ -205,6 +205,20 @@ func TestAddCommand(t *testing.T) {
 				),
 			},
 		},
+		{
+			name: "add_empty_file_in_subdir",
+			args: []string{"/home/user/subdir/empty"},
+			root: map[string]interface{}{
+				"/home/user":                      &vfst.Dir{Perm: 0755},
+				"/home/user/.local/share/chezmoi": &vfst.Dir{Perm: 0700},
+				"/home/user/subdir/empty":         "",
+			},
+			tests: []vfst.Test{
+				vfst.TestPath("/home/user/.local/share/chezmoi/subdir",
+					vfst.TestIsDir,
+				),
+			},
+		},
 		{
 			name: "add_symlink",
 			args: []string{"/home/user/foo"},

diff --git a/internal/chezmoi/targetstate.go b/internal/chezmoi/targetstate.go
@@ -238,10 +238,14 @@ func (ts *TargetState) Add(fs vfs.FS, addOptions AddOptions, targetPath string,
 	case info.Mode().IsRegular():
 		if info.Size() == 0 && !addOptions.Empty {
 			entry, err := ts.Get(fs, targetPath)
-			if err != nil {
+			switch {
+			case os.IsNotExist(err):
+				return nil
+			case err == nil:
+				return mutator.RemoveAll(filepath.Join(ts.SourceDir, entry.SourceName()))
+			default:
 				return err
 			}
-			return mutator.RemoveAll(filepath.Join(ts.SourceDir, entry.SourceName()))
 		}
 		contents, err := fs.ReadFile(targetPath)
 		if err != nil {