1

商城_run.sh

@@ -181,28 +181,32 @@ set_branches(){
 
         branch_count=$(echo "$branches" | wc -l)
         if [ "$branch_count" -gt 1 ]; then
-                echo_content "yellow" "$repo_name 项目:分支选择 (如不需要更换直接回车)："
-                PS3="请输入分支对应的数字："
-                # 显示分支列表并允许选择
-                select branch in $branches; do
-                    if [ -z "$branch" ]; then
-                        # 如果按回车不选择，继续使用当前分支
-                        echo_content "yellow" "继续使用当前分支: $current_branch"
-                        branch="$current_branch"
-                        break
+            echo_content "yellow" "$repo_name 项目:分支选择 (如不需要更换直接回车)："
+            PS3="请输入分支对应的数字："
+    
+            # 显示分支列表并允许选择
+            select branch in $branches; do
+                # 检查是否按了回车且不选择任何分支
+                if [ -z "$branch" ]; then
+                    echo_content "yellow" "继续使用当前分支: $current_branch"
+                    branch="$current_branch"
+                    break
+                elif [ -n "$branch" ]; then
+                    echo_content "green" "你选择了分支: $branch"
+            
+                    # 切换到选定分支
+                    if git show-ref --verify --quiet "refs/heads/$branch"; then
+                        git checkout "$branch"  # 切换到本地分支
                     else
-                        echo_content "green" "你选择了分支: $branch"
-                        
-                        # 切换到选定分支
-                        if git show-ref --verify --quiet "refs/heads/$branch"; then
-                            git checkout "$branch"  # 切换到本地分支
-                        else
-                            git checkout -b "$branch" "origin/$branch"   # 从远程分支创建并切换
-                        fi
-                        break
+                        git checkout -b "$branch" "origin/$branch"  # 从远程分支创建并切换
                     fi
-                done
+                    break
+                else
+                    echo_content "red" "无效的选择，请重新输入。"
+                fi
+            done
         fi
+
 }