fix: 修复git容错处理,修复启动脚本语法错误
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
#!/bin/bash
|
||||
# 创建新任务脚本 - 彻底修复,简单直接方案
|
||||
# 创建新任务脚本 - 带git容错处理
|
||||
|
||||
TASK_ID="TASK-$(date +%Y%m%d%H%M%S)"
|
||||
TASK_FILE="management/tasks/pending/${TASK_ID}.md"
|
||||
@@ -12,11 +12,26 @@ echo "" >> "$TASK_FILE"
|
||||
echo "## 任务需求" >> "$TASK_FILE"
|
||||
echo "$1" >> "$TASK_FILE"
|
||||
|
||||
# 简单直接处理:pull,add,commit,push
|
||||
git pull --rebase origin main > /dev/null 2>&1
|
||||
git add "$TASK_FILE" > /dev/null 2>&1
|
||||
git commit -m "feat: 创建新任务 $TASK_ID" > /dev/null 2>&1
|
||||
git push origin main > /dev/null 2>&1
|
||||
# Git处理,带容错
|
||||
echo "🔄 正在拉取最新代码..."
|
||||
git pull --rebase origin main
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "⚠️ git pull 失败,请先解决冲突后再试"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
git add "$TASK_FILE"
|
||||
git commit -m "feat: 创建新任务 $TASK_ID"
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "⚠️ git commit 失败"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
git push origin main
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "⚠️ git push 失败"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "✅ 任务创建成功: $TASK_ID"
|
||||
echo "📄 文件: $TASK_FILE"
|
||||
|
||||
Reference in New Issue
Block a user