fix bug (#138)

JunNishimura · Jun 24, 2023 · 3e4cefb · 3e4cefb
1 parent 381c116
commit 3e4cefb
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 10 deletions.
diff --git a/cmd/add.go b/cmd/add.go
@@ -90,7 +90,7 @@ var addCmd = &cobra.Command{
 			// check if the arg is the target of excluding path
 			cleanedArg := filepath.Clean(arg)
 			cleanedArg = strings.ReplaceAll(cleanedArg, `\`, "/")
-			if client.Ignore.IsIncluded(cleanedArg) {
+			if client.Ignore.IsIncluded(cleanedArg, client.Idx) {
 				continue
 			}
 

diff --git a/cmd/status.go b/cmd/status.go
@@ -33,7 +33,7 @@ var statusCmd = &cobra.Command{
 		// walk through working directory
 		var newFiles []string
 		var modifiedFiles []string
-		filePaths, err := file.GetFilePathsUnderDirectoryWithIgnore(".", client.Ignore)
+		filePaths, err := file.GetFilePathsUnderDirectoryWithIgnore(".", client.Idx, client.Ignore)
 		if err != nil {
 			return fmt.Errorf("fail to get files: %w", err)
 		}

diff --git a/internal/file/path.go b/internal/file/path.go
@@ -52,7 +52,7 @@ func GetFilePathsUnderDirectory(path string) ([]string, error) {
 	return filePaths, nil
 }
 
-func GetFilePathsUnderDirectoryWithIgnore(path string, ignore *store.Ignore) ([]string, error) {
+func GetFilePathsUnderDirectoryWithIgnore(path string, index *store.Index, ignore *store.Ignore) ([]string, error) {
 	files, err := os.ReadDir(path)
 	if err != nil {
 		return nil, err
@@ -66,12 +66,12 @@ func GetFilePathsUnderDirectoryWithIgnore(path string, ignore *store.Ignore) ([]
 		} else {
 			filePath = fmt.Sprintf("%s/%s", path, file.Name())
 		}
-		if ignore.IsIncluded(filePath) {
+		if ignore.IsIncluded(filePath, index) {
 			continue
 		}
 
 		if file.IsDir() {
-			gotFilePaths, err := GetFilePathsUnderDirectoryWithIgnore(filePath, ignore)
+			gotFilePaths, err := GetFilePathsUnderDirectoryWithIgnore(filePath, index, ignore)
 			if err != nil {
 				return nil, err
 			}

diff --git a/internal/store/ignore.go b/internal/store/ignore.go
@@ -59,11 +59,17 @@ func (i *Ignore) load(rootGoitPath string) error {
 }
 
 // return true if the parameter is included in ignore list
-func (i *Ignore) IsIncluded(path string) bool {
+func (i *Ignore) IsIncluded(path string, index *Index) bool {
 	target := path
-	info, _ := os.Stat(path)
-	if info.IsDir() && !directoryRegexp.MatchString(path) {
-		target = fmt.Sprintf("%s/", path)
+	info, err := os.Stat(path)
+	if os.IsNotExist(err) {
+		if len(index.GetEntriesByDirectory(path)) > 0 {
+			target = fmt.Sprintf("%s/", path)
+		}
+	} else {
+		if info.IsDir() && !directoryRegexp.MatchString(path) {
+			target = fmt.Sprintf("%s/", path)
+		}
 	}
 	for _, exFile := range i.paths {
 		exRegexp := regexp.MustCompile(exFile)

diff --git a/internal/store/index.go b/internal/store/index.go
@@ -362,7 +362,7 @@ func (idx *Index) DiffWithTree(tree *object.Tree) ([]*DiffEntry, error) {
 		if !isRegistered {
 			diffEntries = append(diffEntries, &DiffEntry{
 				Dt:    diffDelete,
-				Entry: entry,
+				Entry: gotEntry,
 			})
 		} else if !entry.Hash.Compare(gotEntry.Hash) {
 			diffEntries = append(diffEntries, &DiffEntry{