Merge pull request #579 from intersystems/fix-481

Remove deleted files from index to avoid errors on commit

Author: isc-tleavitt

CHANGELOG.md

@@ -41,6 +41,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Report error more clearly if you try to create a branch with an invalid name (#534)
 - Don't default to WINDOWS style paths (#357)
 - Fix errors when deleting non-existent files on import (#524)
+- Fix errors on commit when a file was added, never committed, then deleted from the repository (#481)
 - Fixed issue with saving multiple new no-folder mapping settings at the same time (#533)
 
 ## [2.6.0] - 2024-10-07

cls/SourceControl/Git/Change.cls

@@ -177,6 +177,20 @@ ClassMethod RefreshUncommitted(Display = 0, IncludeRevert = 0, Output gitFiles,
             if $$$ISERR(sc) continue
         }
     }
+
+    // If a file was added to the index and then deleted, git status will show it as a delete but committing will fail.
+    // The solution is to git add each deleted file that has never been committed so it will be removed from the index.
+    set key = $order(gitFiles(""))
+    while (key '= "") {
+        if $listget(gitFiles(key),1) = "D" {
+            set filename = $listget(gitFiles(key),2)
+            do ##class(SourceControl.Git.Utils).RunGitCommandWithInput("log",,.errStream,.outStream,"--first-parent", "--", filename)
+            if (outStream.Size = 0) {
+                do ##class(SourceControl.Git.Utils).RunGitCommandWithInput("add",,errStream,outStream,filename)
+            }
+        }
+        set key = $order(gitFiles(key))
+    }
     set ^IRIS.Temp.gitsourcecontrol("Refresh") = $zdatetime($ztimestamp,-2)
     merge ^IRIS.Temp.gitsourcecontrol("LastUncommitted") = gitFiles
     quit sc