Built in Git: cannot commit deleted files #394

dashjoin · Jul 16, 2024 · c15e93b · c15e93b
1 parent 210bd4a
commit c15e93b
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/dashjoin-core/src/main/java/org/dashjoin/function/GitCommit.java b/dashjoin-core/src/main/java/org/dashjoin/function/GitCommit.java
@@ -3,7 +3,9 @@
 import java.net.URL;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Set;
 import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.api.Status;
 import org.eclipse.jgit.internal.storage.file.FileRepository;
 import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider;
 import org.eclipse.microprofile.config.ConfigProvider;
@@ -27,8 +29,13 @@ public Void run(List args) throws Exception {
     if (message == null || paths == null || paths.isEmpty())
       throw new IllegalArgumentException("Arguments required: $gitCommit(message, [paths])");
     try (Git git = new Git(new FileRepository(services.getTenantHome() + "/.git"))) {
+      Status status = git.status().call();
+      Set<String> missing = status.getMissing();
       for (Object s : paths)
-        git.add().addFilepattern("" + s).call();
+        if (missing.contains(s))
+          git.rm().addFilepattern("" + s).call();
+        else
+          git.add().addFilepattern("" + s).call();
       git.commit().setMessage(message).call();
       git.push()
           .setCredentialsProvider(