From 773cc9f6c161f59cbc1c4b71186b4c2b87e81e17 Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@QQ.COM>
Date: Wed, 1 Jul 2026 04:42:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dgit=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ashMergeProjects-to-Projects_Keeper_Tag.sh | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/.winboll/bashMergeProjects-to-Projects_Keeper_Tag.sh b/.winboll/bashMergeProjects-to-Projects_Keeper_Tag.sh
index f43a172..8811d3a 100644
--- a/.winboll/bashMergeProjects-to-Projects_Keeper_Tag.sh
+++ b/.winboll/bashMergeProjects-to-Projects_Keeper_Tag.sh
@@ -38,7 +38,7 @@ if [ "${NOW_BRANCH}" != "${TARGET_BRANCH}" ];then
     exit 1
 fi
 
-# 目录结构校验
+# 目录结构校验白名单（不含 . ..）
 MERGE_OBJECTS_LIST=(
 .git
 .gitignore
@@ -76,9 +76,12 @@ winboll.properties-demo
 )
 
 REAL_ITEMS=()
+# 标准排序ls输出，循环强制过滤 . 和 ..
 while IFS= read -r line; do
-    [[ $line != "." && $line != ".." ]] && REAL_ITEMS+=("$line")
-# 替换为固定ASCII排序、单列无颜色输出，解决排序错乱问题
+    # 跳过虚拟目录 . 和 ..
+    if [[ "$line" != "." && "$line" != ".." ]]; then
+        REAL_ITEMS+=("$line")
+    fi
 done < <(LC_COLLATE=C ls -a1 --color=none)
 
 check_diff(){
@@ -90,7 +93,17 @@ check_diff(){
         [[ ! " ${MERGE_OBJECTS_LIST[@]} " =~ " ${i} " ]] && extra+=("$i")
     done
     if [[ ${#miss[@]} -gt 0 || ${#extra[@]} -gt 0 ]];then
+        echo "========================================"
         echo "本地目录结构不一致，终止运行"
+        if [[ ${#miss[@]} -gt 0 ]]; then
+            echo -e "\n缺失条目："
+            for m in "${miss[@]}"; do echo "  $m"; done
+        fi
+        if [[ ${#extra[@]} -gt 0 ]]; then
+            echo -e "\n多余条目："
+            for e in "${extra[@]}"; do echo "  $e"; done
+        fi
+        echo "========================================"
         exit 1
     fi
 }