go-git · zjs1012 · Mar 31, 2025 · pjbgf · Apr 26, 2025
diff --git a/worktree_status.go b/worktree_status.go
@@ -651,12 +651,31 @@ func (w *Worktree) doRemoveFile(idx *index.Index, path string) (plumbing.Hash, e
 func (w *Worktree) deleteFromIndex(idx *index.Index, path string) (plumbing.Hash, error) {
 	e, err := idx.Remove(path)
 	if err != nil {
+		if errors.Is(err, index.ErrEntryNotFound) {
+			return plumbing.ZeroHash, w.deleteFilesFromIndex(idx, path)
+		}
 		return plumbing.ZeroHash, err
 	}
 
 	return e.Hash, nil
 }
 
+// when adding a deleted directory, you cannot process it through idx.Remove, need to traverse and process the index entry under the directory
+func (w *Worktree) deleteFilesFromIndex(idx *index.Index, path string) error {
+	path = filepath.ToSlash(path)
+	count := 0
+	for index, e := range idx.Entries {
+		if strings.HasPrefix(e.Name, path) {
+			idx.Entries = append(idx.Entries[:index], idx.Entries[index+1:]...)
+			count++
+		}
-		}
+			break
+		}
-		}
+			break
+		}
+	}
+	if count == 0 {
+		return index.ErrEntryNotFound
+	}
+	return nil
+}
+
 func (w *Worktree) deleteFromFilesystem(path string) error {
 	err := w.Filesystem.Remove(path)
 	if os.IsNotExist(err) {

diff --git a/worktree_status_test.go b/worktree_status_test.go
@@ -6,7 +6,10 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/go-git/go-billy/v5/memfs"
 	"github.com/go-git/go-billy/v5/osfs"
+	"github.com/go-git/go-billy/v5/util"
+	fixtures "github.com/go-git/go-git-fixtures/v4"
 	"github.com/go-git/go-git/v5/plumbing/cache"
 	"github.com/go-git/go-git/v5/storage/filesystem"
 	"github.com/stretchr/testify/assert"
@@ -87,3 +90,51 @@ func TestIndexEntrySizeUpdatedForNonRegularFiles(t *testing.T) {
 	// Check whether the index was updated with the two new line breaks.
 	assert.Equal(t, uint32(len(content)+2), idx.Entries[0].Size)
 }
+
+func TestAddEmptyDirectory(t *testing.T) {
+	f := fixtures.Basic().One()
+	fs := memfs.New()
+	r := NewRepositoryWithEmptyWorktree(f)
+	w := &Worktree{
+		r:          r,
+		Filesystem: fs,
+	}
+
+	err := w.Checkout(&CheckoutOptions{})
+	require.NoError(t, err)
+
+	// write and add foo file in the dir directory
+	require.NoError(t, util.WriteFile(fs, "/dir/f1", []byte("foo"), 0644))
+
+	err = w.AddWithOptions(&AddOptions{
+		Path:       "/dir/f1",
+		SkipStatus: true,
+	})
+	require.NoError(t, err)
+
+	_, err = w.Commit("commit foo only\n", &CommitOptions{
+		Author: defaultSignature(),
+	})
+	require.NoError(t, err)
+
+	// remove dir directory and add it
+	require.NoError(t, util.RemoveAll(fs, "/dir"))
+
+	err = w.AddWithOptions(&AddOptions{
+		Path:       "/dir",
+		SkipStatus: true,
+	})
+	require.NoError(t, err)
+
+	_, err = w.Commit("commit remove dir\n", &CommitOptions{
+		Author: defaultSignature(),
+	})
+	require.NoError(t, err)
+
+	// add invalid directory with error
+	err = w.AddWithOptions(&AddOptions{
+		Path:       "/dir2",
+		SkipStatus: true,
+	})
+	require.Error(t, err)
+}