Browse Source

Consider gitignore, multiple flags for modified rename considered

Syed zainul abedin 1 month ago
parent
commit
2885943d0e
1 changed files with 6 additions and 1 deletions
  1. 6 1
      Assets/Better Git/Arbitrator/Editor/Services/GitExecutors.cs

+ 6 - 1
Assets/Better Git/Arbitrator/Editor/Services/GitExecutors.cs

@@ -472,7 +472,9 @@ namespace Terra.Arbitrator.Services
                     IncludeUntracked = true, 
                     RecurseUntrackedDirs = true,
                     DetectRenamesInIndex = true,
-                    DetectRenamesInWorkDir = true
+                    DetectRenamesInWorkDir = true,
+                    IncludeIgnored = false,
+                    IncludeUnaltered = false
                 };
                 foreach (var entry in repo.RetrieveStatus(statusOptions))
                 {
@@ -486,6 +488,9 @@ namespace Terra.Arbitrator.Services
                     }
                     switch(entry.State)
                     {
+                        case FileStatus.ModifiedInWorkdir | FileStatus.RenamedInWorkdir:
+                            changes.Add(new GitChange(entry.FilePath, null, ChangeKind.Modified));
+                            break;
                         case FileStatus.NewInWorkdir:
                         case FileStatus.NewInIndex:
                             changes.Add(new GitChange(entry.FilePath, null, ChangeKind.Added));