xueteng/video-flow-b
1
0
Fork 0
forked from 77media/video-flow
Code Pull Requests Activity

修复编译脚本中的远程仓库引用，从origin改为movie-flow

Browse Source
This commit is contained in:
北枳 2025-07-04 16:29:07 +08:00
parent baca9081dd
commit 94acd18075
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compile.sh
View File

@ -26,18 +26,18 @@ fi
# 获取最新的远程分支信息 # 获取最新的远程分支信息
echo "正在获取最新的远程分支信息..." | tee -a $LOGFILE echo "正在获取最新的远程分支信息..." | tee -a $LOGFILE
git fetch origin git fetch movie-flow
# 检查远程分支是否和本地分支一致 # 检查远程分支是否和本地分支一致
local_commit=$(git rev-parse HEAD) local_commit=$(git rev-parse HEAD)
remote_commit=$(git rev-parse origin/dev) remote_commit=$(git rev-parse movie-flow/dev)
if [ "$local_commit" != "$remote_commit" ]; then if [ "$local_commit" != "$remote_commit" ]; then
echo "本地分支和远程分支不一致" | tee -a $LOGFILE echo "本地分支和远程分支不一致" | tee -a $LOGFILE
echo "本地分支: $local_commit" | tee -a $LOGFILE echo "本地分支: $local_commit" | tee -a $LOGFILE
echo "远程分支: $remote_commit" | tee -a $LOGFILE echo "远程分支: $remote_commit" | tee -a $LOGFILE
echo "请运行以下命令之一来解决:" | tee -a $LOGFILE echo "请运行以下命令之一来解决:" | tee -a $LOGFILE
echo " git pull origin dev # 如果远程有新提交" | tee -a $LOGFILE echo " git pull movie-flow dev # 如果远程有新提交" | tee -a $LOGFILE
echo " git push origin dev # 如果本地有新提交" | tee -a $LOGFILE echo " git push movie-flow dev # 如果本地有新提交" | tee -a $LOGFILE
exit 1 exit 1
fi fi