From 025c095bcd4d8e0ecbc9c43db3b5a4ac163fc9b6 Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@QQ.COM>
Date: Sun, 17 May 2026 11:18:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=A4=87=E6=B3=A8=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=B8=A6=E4=B8=8A=E6=A0=87=E7=AD=BE=E5=90=8D?=
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, 7 insertions(+), 12 deletions(-)

diff --git a/.winboll/bashMergeProjects-to-Projects_Keeper_Tag.sh b/.winboll/bashMergeProjects-to-Projects_Keeper_Tag.sh
index a568128..b638a6a 100644
--- a/.winboll/bashMergeProjects-to-Projects_Keeper_Tag.sh
+++ b/.winboll/bashMergeProjects-to-Projects_Keeper_Tag.sh
@@ -12,19 +12,14 @@ get_module_latest_tag() {
     # 先同步远程分支元数据
     git fetch origin "$module_dir" 2>/dev/null
 
-    # 【修复】直接取远程分支最新完整Commit，再限定模块目录
+    # 获取该模块目录最新一次提交CommitHash
     local latest_commit
     latest_commit=$(git log -1 --pretty=format:%H "$remote_branch" -- "$module_dir"/ 2>/dev/null)
 
-    echo "  调试：模块[$module_dir] 最新Commit = $latest_commit"
-
     # 无commit直接返回空
-    if [ -z "$latest_commit" ]; then
-        echo "  调试：未获取到有效Commit，跳过"
-        return
-    fi
+    [ -z "$latest_commit" ] && return
 
-    # 【修复】放宽匹配，不用严格行首，兼容ls-remote输出格式
+    # 匹配远程同commit、模块前缀的标签，过滤废弃^{}引用
     git ls-remote --tags origin "${module_dir}*" 2>/dev/null \
     | grep -v '\^{}' \
     | grep "$latest_commit" \
@@ -195,7 +190,6 @@ echo -e "#@@@ 开始合并应用型模块源码 @@@#"
 
 for item in "${MERGE_APP_PROJECT_LIST[@]}"; do
     item_lower=$(echo "$item" | tr 'A-Z' 'a-z')
-    # 自动使用 origin/模块名 作为远程分支，检测标签
     MOD_TAG=$(get_module_latest_tag "$item_lower")
     if [ -z "$MOD_TAG" ]; then
         echo "跳过 $item_lower ：最新提交未打标签"
@@ -204,7 +198,8 @@ for item in "${MERGE_APP_PROJECT_LIST[@]}"; do
     echo "合并 $item_lower （远程分支：origin/$item_lower，标签：$MOD_TAG）"
     git checkout origin/$item_lower $item_lower
     git add .
-    git commit -m "合并 $item 项目(对应标签:$MOD_TAG)"
+    # 提交备注带上标签名
+    git commit -m "合并 $item 项目，关联标签：$MOD_TAG"
 done
 
 ## 合并 LIB 项目
@@ -217,7 +212,6 @@ echo -e "#@@@ 开始合并类库型模块源码 @@@#"
 
 for item in "${MERGE_LIB_PROJECT_LIST[@]}"; do
     item_lower=$(echo "$item" | tr 'A-Z' 'a-z')
-    # 自动使用 origin/模块名 作为远程分支，检测标签
     MOD_TAG=$(get_module_latest_tag "$item_lower")
     if [ -z "$MOD_TAG" ]; then
         echo "跳过 $item_lower ：最新提交未打标签"
@@ -226,7 +220,8 @@ for item in "${MERGE_LIB_PROJECT_LIST[@]}"; do
     echo "合并 $item_lower （远程分支：origin/$item_lower，标签：$MOD_TAG）"
     git checkout origin/$item_lower $item_lower lib$item_lower
     git add .
-    git commit -m "合并 $item 项目(对应标签:$MOD_TAG)"
+    # 提交备注带上标签名
+    git commit -m "合并 $item 项目，关联标签：$MOD_TAG"
 done
 
 echo '正在推送 Projects_Keeper 项目'