sanguo/sanguo_quant_live
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 最终修复 - 先stash再创建文件，避免新文件被stash

Browse Source
This commit is contained in:
cfdaily
2026-03-23 16:51:53 +08:00
parent 48a7929228
commit 00c590d7a6
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
management/workflow/scripts/assign_simple.sh
+4 -2
View File
@@ -1,5 +1,6 @@
#!/bin/bash #!/bin/bash
# 极简分配脚本 - 修复版 # 极简分配脚本 - 最终修复版
# 修复：先stash再创建文件，避免新文件被stash
if [ $# -lt 2 ]; then if [ $# -lt 2 ]; then
echo "使用方法: ./assign_simple.sh <任务ID> <负责人>" echo "使用方法: ./assign_simple.sh <任务ID> <负责人>"
@@ -14,11 +15,12 @@ PENDING_FILE="management/tasks/pending/${TASK_ID}.md"
ASSIGNED_FILE="management/tasks/assigned/${TASK_ID}.md" ASSIGNED_FILE="management/tasks/assigned/${TASK_ID}.md"
AGENT_FILE="management/agents/${AGENT}/${TASK_ID}.task" AGENT_FILE="management/agents/${AGENT}/${TASK_ID}.task"
# 自动处理git冲突 - 先stash本地修改 # 自动处理git冲突 - 先stash本地未提交的修改
git stash push -q > /dev/null 2>&1 git stash push -q > /dev/null 2>&1
# 确保Agent目录存在 # 确保Agent目录存在
mkdir -p "management/agents/${AGENT}" mkdir -p "management/agents/${AGENT}"
mkdir -p management/tasks/assigned
# 复制任务文件 # 复制任务文件
cp "$PENDING_FILE" "$ASSIGNED_FILE" cp "$PENDING_FILE" "$ASSIGNED_FILE"
management/workflow/scripts/create_simple.sh
+8 -3
View File
@@ -1,9 +1,14 @@
#!/bin/bash #!/bin/bash
# 创建新任务脚本 - 修复版 # 创建新任务脚本 - 最终修复版
# 修复：先stash再创建文件，避免新文件被stash
# 自动处理git冲突 - 先stash本地未提交的修改
git stash push -q > /dev/null 2>&1
TASK_ID="TASK-$(date +%Y%m%d%H%M%S)" TASK_ID="TASK-$(date +%Y%m%d%H%M%S)"
TASK_FILE="management/tasks/pending/${TASK_ID}.md" TASK_FILE="management/tasks/pending/${TASK_ID}.md"
mkdir -p management/tasks/pending
echo "# 任务ID: $TASK_ID" > "$TASK_FILE" echo "# 任务ID: $TASK_ID" > "$TASK_FILE"
echo "# 状态: pending" >> "$TASK_FILE" echo "# 状态: pending" >> "$TASK_FILE"
echo "# 创建时间: $(date)" >> "$TASK_FILE" echo "# 创建时间: $(date)" >> "$TASK_FILE"
@@ -11,11 +16,11 @@ echo "" >> "$TASK_FILE"
echo "## 任务需求" >> "$TASK_FILE" echo "## 任务需求" >> "$TASK_FILE"
echo "$1" >> "$TASK_FILE" echo "$1" >> "$TASK_FILE"
# 自动处理git冲突 - 先stash本地修改，创建完再恢复
git stash push -q > /dev/null 2>&1
git add "$TASK_FILE" > /dev/null 2>&1 git add "$TASK_FILE" > /dev/null 2>&1
git commit -m "feat: 创建新任务 $TASK_ID" > /dev/null 2>&1 git commit -m "feat: 创建新任务 $TASK_ID" > /dev/null 2>&1
git push origin main > /dev/null 2>&1 git push origin main > /dev/null 2>&1
# 恢复本地修改，如果失败就丢弃stash
git stash pop -q > /dev/null 2>&1 || git stash drop -q > /dev/null 2>&1 git stash pop -q > /dev/null 2>&1 || git stash drop -q > /dev/null 2>&1
echo "✅ 任务创建成功: $TASK_ID" echo "✅ 任务创建成功: $TASK_ID"