From 2945431dea5d72b78a6c38d71c8b2569d90f9071 Mon Sep 17 00:00:00 2001
From: Manish Kumar <107841575+sondermanish@users.noreply.github.com>
Date: Mon, 22 Sep 2025 16:52:35 +0530
Subject: [PATCH] chore: disabled autocommit (#41246)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Description
> [!TIP]
> _Add a TL;DR when the description is longer than 500 words or
extremely technical (helps the content, marketing, and DevRel team)._
>
> _Please also include relevant motivation and context. List any
dependencies that are required for this change. Add links to Notion,
Figma or any other documents that might be relevant to the PR._


Fixes #`Issue Number`
_or_
Fixes `Issue URL`
> [!WARNING]
> _If no issue exists, please create an issue first, and check with the
maintainers if the issue is valid._

## Automation

/ok-to-test tags="@tag.Git"

### :mag: Cypress test results
<!-- This is an auto-generated comment: Cypress test results  -->
> [!IMPORTANT]
> 🟣 🟣 🟣 Your tests are running.
> Tests running at:
<https://github.com/appsmithorg/appsmith/actions/runs/17913609729>
> Commit: 2055a6b1f1f8b90651f7ad384736905e9a957e6d
> Workflow: `PR Automation test suite`
> Tags: `@tag.Git`
> Spec: ``
> <hr>Mon, 22 Sep 2025 11:18:58 UTC
<!-- end of auto-generated comment: Cypress test results  -->


## Communication
Should the DevRel and Marketing teams inform users about this change?
- [ ] Yes
- [ ] No


<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

* **Chores**
* Temporarily disabled Git auto-commit; auto-commit operations no longer
execute.
* Auto-commit status responses now consistently report IDLE with 0%
progress.
* Users may notice no automatic commits in linked repositories; manual
commits unaffected.
* No changes to public API signatures; only response behavior adjusted.

* **Tests**
* End-to-end test for Git autocommit is skipped to reflect disabled
auto-commit.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
---
 .../Regression/ClientSide/Git/GitAutocommit_spec.ts    |  2 +-
 .../git/controllers/GitApplicationControllerCE.java    | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitAutocommit_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Git/GitAutocommit_spec.ts
index fd4953708c..cdadb595e0 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Git/GitAutocommit_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Git/GitAutocommit_spec.ts
@@ -26,7 +26,7 @@ describe(
     ],
   },
   function () {
-    it("Check if autocommit progress bar is visible and network requests are properly called", function () {
+    it.skip("Check if autocommit progress bar is visible and network requests are properly called", function () {
       agHelper.GenerateUUID();
       cy.get("@guid").then((uid) => {
         wsName = "GitAC-" + uid;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/git/controllers/GitApplicationControllerCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/git/controllers/GitApplicationControllerCE.java
index 91b611d8b9..f26eeae706 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/git/controllers/GitApplicationControllerCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/git/controllers/GitApplicationControllerCE.java
@@ -15,6 +15,7 @@ import com.appsmith.server.domains.Artifact;
 import com.appsmith.server.domains.GitArtifactMetadata;
 import com.appsmith.server.domains.GitAuth;
 import com.appsmith.server.dtos.AutoCommitResponseDTO;
+import com.appsmith.server.dtos.AutoCommitResponseDTO.AutoCommitResponse;
 import com.appsmith.server.dtos.BranchProtectionRequestDTO;
 import com.appsmith.server.dtos.GitAuthDTO;
 import com.appsmith.server.dtos.GitConnectDTO;
@@ -288,9 +289,12 @@ public class GitApplicationControllerCE {
             artifactType = ArtifactType.APPLICATION,
             operation = GitRouteOperation.AUTO_COMMIT)
     public Mono<ResponseDTO<AutoCommitResponseDTO>> autoCommitApplication(@PathVariable String branchedApplicationId) {
-        return autoCommitService
-                .autoCommitApplication(branchedApplicationId)
-                .map(data -> new ResponseDTO<>(HttpStatus.OK, data));
+        // disabling autocommit till in-memory git has been incorporated in the auto-commit
+        AutoCommitResponseDTO autoCommitResponseDTO = new AutoCommitResponseDTO();
+        autoCommitResponseDTO.setAutoCommitResponse(AutoCommitResponse.IDLE);
+        autoCommitResponseDTO.setProgress(0);
+
+        return Mono.just(autoCommitResponseDTO).map(data -> new ResponseDTO<>(HttpStatus.OK, data));
     }
 
     @JsonView(Views.Public.class)