sayurinana/agent-aide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[aide] task-optimize: 修复已实现：git add_all 方法排除 .lock 文件

Browse Source
This commit is contained in:
sayurinana(vm)
2025-12-18 10:11:18 +08:00
parent 9d4f6b8a22
commit f3de256fa3
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.aide/flow-status.json
View File

@@ -1,7 +1,7 @@
{ {
"task_id": "2025-12-18T10-09-00", "task_id": "2025-12-18T10-09-00",
"current_phase": "task-optimize", "current_phase": "task-optimize",
"current_step": 2, "current_step": 3,
"started_at": "2025-12-18T10:09:00+08:00", "started_at": "2025-12-18T10:09:00+08:00",
"history": [ "history": [
{ {
@@ -17,7 +17,15 @@
"action": "next-step", "action": "next-step",
"phase": "task-optimize", "phase": "task-optimize",
"step": 2, "step": 2,
"summary": "问题定位完成：finish 环节在锁内执行 git add，导致 .lock 文件被提交" "summary": "问题定位完成：finish 环节在锁内执行 git add，导致 .lock 文件被提交",
"git_commit": "9d4f6b8a2234376ce5498fc0a0c4f3d06e2f4550"
},
{
"timestamp": "2025-12-18T10:11:18+08:00",
"action": "next-step",
"phase": "task-optimize",
"step": 3,
"summary": "修复已实现：git add_all 方法排除 .lock 文件"
} }
], ],
"source_branch": "master", "source_branch": "master",

4
aide-program/aide/flow/git.py
View File

@@ -25,8 +25,8 @@ class GitIntegration:
def add_all(self) -> None: def add_all(self) -> None:
self.ensure_repo() self.ensure_repo()
# 使用 -A 确保删除的文件也被暂存 # 使用 -A 确保删除的文件也被暂存，排除 .lock 文件避免锁文件被提交
result = self._run(["add", "-A"], check=False) result = self._run(["add", "-A", "--", ".", ":!*.lock"], check=False)
if result.returncode != 0: if result.returncode != 0:
raise FlowError(_format_git_error("git add 失败", result)) raise FlowError(_format_git_error("git add 失败", result))