標準 git-flow (AVH Edition) 僅支援單一 master/develop 分支對。專案若存在多條產線 (如 master_sina, master_qq, master_buzz),每條對應獨立 develop,原版需手動修改 .git/config 切換極不便。本文展示如何修改 git-flow 子命令腳本 (git-flow-hotfix 等),新增 動態分支前綴識別、刪除功能、追蹤遠端熱修復分支 等擴充,實現多產線並行管理。
master_X/develop_X。hotfix/feature 時需指定基準 master_X/develop_X。git flow 介面,透過分支命名慣例 (如 qq_hotfix_1.2.3) 自動推斷目標基準分支。git flow hotfix delete [branch]、git flow feature delete [branch] 刪除本地/遠端分支。
init() {
require_git_repo
require_gitflow_initialized
gitflow_load_settings
VERSION_PREFIX=$(eval "echo \`git config --get gitflow.prefix.versiontag\`")
PREFIX=$(git config --get gitflow.prefix.hotfix) # 預設 hotfix/
}
usage() {
echo "usage: git flow hotfix [list] [-v]"
echo " git flow hotfix start [-F] [ ]"
echo " git flow hotfix finish [-Fsumpk] "
echo " git flow hotfix publish "
echo " git flow hotfix delete [branch]" # 新增
echo " git flow hotfix track "
}
cmd_delete() {
local branch_name="$1"
if [ -z "$branch_name" ]; then
# 刪除當前 hotfix 分支
branch_name=$(git branch --no-color | grep '^\* ' | sed 's/^\* //')
if ! echo "$branch_name" | grep -q "^$PREFIX"; then
die "Not on a hotfix branch."
fi
else
# 允許指定完整分支名或僅版本號 (自動加前綴)
case "$branch_name" in
$PREFIX*) ;;
*) branch_name="$PREFIX$branch_name" ;;
esac
fi
git branch -D "$branch_name"
git push origin --delete "$branch_name" 2>/dev/null || true
}
cmd_start() {
# 解析參數...
local version="$1"
local base="$2"
# 動態判斷:若 version 以 qq_ 開頭 → 基準 master_qq
case "$version" in
qq_*) MASTER_BRANCH="master_qq"; DEVELOP_BRANCH="develop_qq" ;;
sina_*) MASTER_BRANCH="master_sina"; DEVELOP_BRANCH="develop_sina" ;;
buzz_*) MASTER_BRANCH="master_buzz"; DEVELOP_BRANCH="develop_buzz" ;;
*) # 使用預設 gitflow.branch.master/develop
gitflow_load_settings ;;
esac
# 後續建立分支邏輯使用動態 MASTER_BRANCH/DEVELOP_BRANCH
git checkout -b "$PREFIX$version" "$MASTER_BRANCH"
# ...
}
cmd_list() {
# ...
local base=$(git merge-base "$fullname" "$MASTER_BRANCH") # 使用動態 MASTER_BRANCH
# 顯示分支名、基準 commit、標籤等
}
[gitflow "branch"]
master = master_sina
develop = develop_sina
[gitflow "prefix"]
feature = feature/
hotfix = hotfix/
release = release/
versiontag = v
搭配命名慣例:git flow hotfix start qq_1.2.3 自動基於 master_qq;git flow hotfix start sina_1.2.3 基於 master_sina。
同樣套用上述模式至 git-flow-feature、git-flow-release,實現全系列動態分支支援。
# 針對 QQ 版本線建立熱修復
git flow hotfix start qq_1.2.4
# 修復代碼...
git flow hotfix finish qq_1.2.4 # 合併回 master_qq、develop_qq、打標籤 v1.2.4
git flow hotfix publish qq_1.2.4 # 推送至遠端
# 刪除已完成的熱修復分支
git flow hotfix delete qq_1.2.4 # 刪除本地與遠端
# 列出所有熱修復分支 (自動識別各產線)
git flow hotfix list
維護建議:將修改後的git-flow-*腳本放入團隊共享dotfiles或內部套件倉庫,透過安裝腳本統一部署至開發機器。長期來看,單一倉庫多條長期平行產線建議拆分為多倉庫或採用 Trunk-Based Development + Feature Flags 降低分支複雜度。