feat: improve commit eligibility check in GitConflictDetector

lakernote · lakernote · commit 0862f49ad27c · 2025-10-14T17:37:29.000+08:00
diff --git a/src/main/java/com/laker/postman/service/git/GitConflictDetector.java b/src/main/java/com/laker/postman/service/git/GitConflictDetector.java
@@ -92,7 +92,9 @@ private static void checkLocalStatus(Status status, GitStatusCheck result) {
         result.conflicting.addAll(status.getConflicting());
 
         // 检查是否可以提交
-        result.canCommit = result.hasUncommittedChanges;
+        int totalChanges = result.added.size() + result.changed.size() + result.modified.size()
+                + result.missing.size() + result.removed.size() + result.untracked.size();
+        result.canCommit = totalChanges > 0 && result.conflicting.isEmpty();
     }
 
     private static void checkRemoteStatus(Git git, String workspacePath, GitStatusCheck result,

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,9 @@ private static void checkLocalStatus(Status status, GitStatusCheck result) {`
`92`	`92`	`result.conflicting.addAll(status.getConflicting());`
`93`	`93`
`94`	`94`	`// 检查是否可以提交`
`95`		`- result.canCommit = result.hasUncommittedChanges;`
	`95`	`+ int totalChanges = result.added.size() + result.changed.size() + result.modified.size()`
	`96`	`+ + result.missing.size() + result.removed.size() + result.untracked.size();`
	`97`	`+ result.canCommit = totalChanges > 0 && result.conflicting.isEmpty();`
`96`	`98`	`}`
`97`	`99`
`98`	`100`	`private static void checkRemoteStatus(Git git, String workspacePath, GitStatusCheck result,`