多master/develop分支如何使用gitflow版本控制

小明SEO博客 小明SEO博客，新时代SEO博客

在使用 gitflow 做版本控制系统,发现gitflow的时候只能指定一个master/develop，如果要多分支使用要如何操作呢?那么来看看我是如何给gitflow加料的。

公司都是git作为版本控制，公司一些项目组在用gitflow,但是我们组没有强制,但是我上月出了一次事故,总结就是分支管理问题，所以开始强迫自己使用gitflow,以前的项目是一个master和一个develop,自己checkout一个分支,然后merge(不理解的可以看看a-successful-git-branching-model).

问题出现了:项目有几个主分支和开发分支,比如master_sina,master_qq. master_buzz ,而gitflow的时候只能指定一个master/develop, 这样你start一个feature/hotfix之前就要去.git/config里面修改 [gitflow “branch”]项的相关主分支和开发分支,so不方便,看了下源码,给gitflow加点料.

添加功能

当你打开了feature/hotfix分支,但是你不想要它了(当然你可以直接git branch -D xx),使用git flow hotfix/feature delete,自动帮你删除这个分支,以便你新建其他分支(git flow只容许你一次存在一个hotfix/feature分支).

你想使用gitflow删除其它存在分支嘛?不需要 git branch -D,你还可以git flow hotfix/feature delete XX.

比如我在init的时候指定了master为master_sina,而当我想创建master_qq的hotfix,我只需要在start的是否给它取名字是’qq_‘开头的即可,要是有其它的需要你可以直接在源码里面添加对应的内容.

例子 git-flow-hotfix 我主要标记我修改的部分,代码如下:

  1. init(){
  2. require_git_repo
  3. require_gitflow_initialized
  4. gitflow_load_settings
  5. VERSION_PREFIX=$(eval"echo`gitconfig--getgitflow.prefix.versiontag`")
  6. PREFIX=$(gitconfig--getgitflow.prefix.hotfix)
  7. }
  8. #增加help的选项说明
  9. usage(){
  10. echo"usage:gitflowhotfix[list][-v]"
  11. echo"gitflowhotfixstart[-F]<version>[<base>]"
  12. echo"gitflowhotfixfinish[-Fsumpk]<version>"
  13. echo"gitflowhotfixpublish<version>"
  14. echo"gitflowhotfixdelete[branch]"
  15. echo"gitflowhotfixtrack<version>"
  16. }
  17. cmd_default(){
  18. cmd_list"$@"
  19. }
  21. cmd_list(){
  22. DEFINE_booleanverbosefalse'verbose(more)output'v
  23. parse_args"$@"
  25. localhotfix_branches
  26. localcurrent_branch
  27. localshort_names
  28. hotfix_branches=$(echo"$(git_local_branches)"|grep"^$PREFIX")
  29. if[-z"$hotfix_branches"];then
  30. warn"Nohotfixbranchesexist."
  31. warn""
  32. warn"Youcanstartanewhotfixbranch:"
  33. warn""
  34. warn"gitflowhotfixstart<version>[<base>]"
  35. warn""
  36. exit0
  37. fi
  38. current_branch=$(gitbranch--no-color|grep'^*'|grep-v'nobranch'|sed's/^*//g')
  39. short_names=$(echo"$hotfix_branches"|sed"s^$PREFIXg")
  41. #determinecolumnwidthfirst
  42. localwidth=0
  43. localbranch
  44. forbranchin$short_names;do
  45. locallen=${#branch}
  46. width=$(max$width$len)
  47. done
  48. width=$(($width+3))
  50. localbranch
  51. forbranchin$short_names;do
  52. localfullname=$PREFIX$branch
  53. localbase=$(gitmerge-base"$fullname""$MASTER_BRANCH")
  54. localmaster_sha=$(gitrev-parse"$MASTER_BRANCH")
  55. localbranch_sha=$(gitrev-parse"$fullname")
  56. if["$fullname"="$current_branch"];then
  57. printf"*"
  58. else
  59. printf""
  60. fi
  61. ifflagverbose;then
  62. printf"%-${width}s""$branch"
  63. if["$branch_sha"="$master_sha"];then
  64. printf"(nocommitsyet)"
  65. else--phpfensi.com
  66. localtagname=$(gitname-rev--tags--no-undefined--name-only"$base")
  67. localnicename
  68. if["$tagname"!=""];then
  69. nicename=$tagname
  70. else
  71. nicename=$(gitrev-parse--short"$base")
  72. fi
  73. printf"(basedon$nicename)"
  74. fi
  75. else
  76. printf"%s""$branch"
  77. fi
  78. echo
  79. done
  80. }
  82. cmd_help(){
  83. usage
  84. exit0
  85. }
  87. parse_args(){
  88. #parseoptions
  89. FLAGS"$@"||exit$?
  90. evalset--"${FLAGS_ARGV}"
  91. #readargumentsintoglobalvariables
  92. VERSION=$1
  93. BRANCH=$PREFIX$VERSION

这里就是我多master/develop的技巧,我这里会判断要新建的分支的前缀,要是qq_开头就会基于master_qq和develop_qq创建分支,所以你可以根据你的需要在这里加一些方法.

  1. test`exprmatch"$@""qq_"`-ne0&&MASTER_BRANCH="$MASTER_BRANCH"_qq&&
  2. DEVELOP_BRANCH="$DEVELOP_BRANCH"_qq
  3. }
  5. require_version_arg(){
  6. if["$VERSION"=""];then
  7. warn"Missingargument<version>"
  8. usage
  9. exit1
  10. fi
  11. }
  13. require_base_is_on_master(){
  14. if!gitbranch--no-color--contains"$BASE"2>/dev/null
  15. |sed's/[*]//g'
  16. |grep-q"^$MASTER_BRANCH$";then
  17. die"fatal:Givenbase'$BASE'isnotavalidcommiton'$MASTER_BRANCH'."
  18. fi
  19. }
  21. require_no_existing_hotfix_branches(){
  22. localhotfix_branches=$(echo"$(git_local_branches)"|grep"^$PREFIX")
  23. localfirst_branch=$(echo${hotfix_branches}|head-n1)
  24. first_branch=${first_branch#$PREFIX}
  25. [-z"$hotfix_branches"]||
  26. die"Thereisanexistinghotfixbranch($first_branch).Finishthatonefirst."
  27. }
  28. #添加delete参数，函数需要cmd_开头
  29. cmd_delete(){
  30. if["$1"=""];then
  31. #当不指定参数自动去找存在的未关闭的gitflow分支
  32. localhotfix_branches=$(echo"$(git_local_branches)"|grep"^$PREFIX")
  33. test"$hotfix_branches"=""&&die"Therehasnotexistinghotfixbranchcandelete"&&exit1
  34. else
  35. #指定参数先判断参数是不是的数量格式
  36. test$#!=1&&die"Thereonlyneedoneparameterindicatesthebranchtobedeleted"&&exit1
  37. hotfix_branches="$1"
  38. fi
  39. #当要删除的分支就是当前分支，先checkout到develop分支
  40. test"$hotfix_branches"="$(git_current_branch)"&&echo'Firstcheckoutdevelpbranch';git_docheckout"$DEVELOP_BRANCH"
  41. gitbranch-D${hotfix_branches}>/dev/null2>&1&&echo'DeleteSuccessed'||die"Didnotfindbranch:[$hotfix_branches]"
  43. }
  44. cmd_start(){
  45. DEFINE_booleanfetchfalse"fetchfrom$ORIGINbeforeperformingfinish"F
  46. parse_args"$@"
  47. BASE=${2:-$MASTER_BRANCH}
  48. require_version_arg
  49. require_base_is_on_master
  50. require_no_existing_hotfix_branches
  52. #sanitychecks
  53. require_clean_working_tree
  54. require_branch_absent"$BRANCH"
  55. require_tag_absent"$VERSION_PREFIX$VERSION"
  56. ifflagfetch;then
  57. git_dofetch-q"$ORIGIN""$MASTER_BRANCH"
  58. fi
  59. ifhas"$ORIGIN/$MASTER_BRANCH"$(git_remote_branches);then
  60. require_branches_equal"$MASTER_BRANCH""$ORIGIN/$MASTER_BRANCH"
  61. fi
  63. #createbranch
  64. git_docheckout-b"$BRANCH""$BASE"
  66. echo
  67. echo"Summaryofactions:"
  68. echo"-Anewbranch'$BRANCH'wascreated,basedon'$BASE'"
  69. echo"-Youarenowonbranch'$BRANCH'"
  70. echo
  71. echo"Follow-upactions:"
  72. echo"-Bumptheversionnumbernow!"
  73. echo"-Startcommittingyourhotfixes"
  74. echo"-Whendone,run:"
  75. echo
  76. echo"gitflowhotfixfinish'$VERSION'"
  77. echo
  78. }
  80. cmd_publish(){
  81. parse_args"$@"
  82. require_version_arg
  84. #sanitychecks
  85. require_clean_working_tree
  86. require_branch"$BRANCH"
  87. git_dofetch-q"$ORIGIN"
  88. require_branch_absent"$ORIGIN/$BRANCH"
  90. #createremotebranch
  91. git_dopush"$ORIGIN""$BRANCH:refs/heads/$BRANCH"
  92. git_dofetch-q"$ORIGIN"
  94. #configureremotetracking
  95. gitconfig"branch.$BRANCH.remote""$ORIGIN"
  96. gitconfig"branch.$BRANCH.merge""refs/heads/$BRANCH"
  97. git_docheckout"$BRANCH"
  99. echo
  100. echo"Summaryofactions:"
  101. echo"-Anewremotebranch'$BRANCH'wascreated"
  102. echo"-Thelocalbranch'$BRANCH'wasconfiguredtotracktheremotebranch"
  103. echo"-Youarenowonbranch'$BRANCH'"
  104. echo
  105. }
  107. cmd_track(){
  108. parse_args"$@"
  109. require_version_arg
  111. #sanitychecks
  112. require_clean_working_tree
  113. require_branch_absent"$BRANCH"
  114. git_dofetch-q"$ORIGIN"
  115. require_branch"$ORIGIN/$BRANCH"
  117. #createtrackingbranch
  118. git_docheckout-b"$BRANCH""$ORIGIN/$BRANCH"
  120. echo
  121. echo"Summaryofactions:"
  122. echo"-Anewremotetrackingbranch'$BRANCH'wascreated"
  123. echo"-Youarenowonbranch'$BRANCH'"
  124. echo
  125. }
  127. cmd_finish(){
  128. DEFINE_booleanfetchfalse"fetchfrom$ORIGINbeforeperformingfinish"F
  129. DEFINE_booleansignfalse"signthereleasetagcryptographically"s
  130. DEFINE_stringsigningkey"""usethegivenGPG-keyforthedigitalsignature(implies-s)"u
  131. DEFINE_stringmessage"""usethegiventagmessage"m
  132. DEFINE_stringmessagefile"""usethecontentsofthegivenfileastagmessage"f
  133. DEFINE_booleanpushfalse"pushto$ORIGINafterperformingfinish"p
  134. DEFINE_booleankeepfalse"keepbranchafterperformingfinish"k
  135. DEFINE_booleannotagfalse"don'ttagthisrelease"n
  136. parse_args"$@"
  137. require_version_arg
  139. #handleflagsthatimplyotherflags
  140. if["$FLAGS_signingkey"!=""];then
  141. FLAGS_sign=$FLAGS_TRUE
  142. fi
  144. #sanitychecks
  145. require_branch"$BRANCH"
  146. require_clean_working_tree
  147. ifflagfetch;then
  148. git_dofetch-q"$ORIGIN""$MASTER_BRANCH"||
  149. die"Couldnotfetch$MASTER_BRANCHfrom$ORIGIN."
  150. git_dofetch-q"$ORIGIN""$DEVELOP_BRANCH"||
  151. die"Couldnotfetch$DEVELOP_BRANCHfrom$ORIGIN."
  152. fi
  153. ifhas"$ORIGIN/$MASTER_BRANCH"$(git_remote_branches);then
  154. require_branches_equal"$MASTER_BRANCH""$ORIGIN/$MASTER_BRANCH"
  155. fi
  156. ifhas"$ORIGIN/$DEVELOP_BRANCH"$(git_remote_branches);then
  157. require_branches_equal"$DEVELOP_BRANCH""$ORIGIN/$DEVELOP_BRANCH"
  158. fi
  160. #trytomergeintomaster
  161. #incaseapreviousattempttofinishthisreleasebranchhasfailed,
  162. #butthemergeintomasterwassuccessful,weskipitnow
  163. if!git_is_branch_merged_into"$BRANCH""$MASTER_BRANCH";then
  164. git_docheckout"$MASTER_BRANCH"||
  165. die"Couldnotcheckout$MASTER_BRANCH."
  166. git_domerge--no-ff"$BRANCH"||
  167. die"Thereweremergeconflicts."
  168. #TODO:Whatdowedonow?
  169. fi
  171. ifnoflagnotag;then
  172. #trytotagtherelease
  173. #incaseapreviousattempttofinishthisreleasebranchhasfailed,
  174. #butthetagwassetsuccessful,weskipitnow
  175. localtagname=$VERSION_PREFIX$VERSION
  176. if!git_tag_exists"$tagname";then
  177. localopts="-a"
  178. flagsign&&opts="$opts-s"
  179. ["$FLAGS_signingkey"!=""]&&opts="$opts-u'$FLAGS_signingkey'"
  180. ["$FLAGS_message"!=""]&&opts="$opts-m'$FLAGS_message'"
  181. ["$FLAGS_messagefile"!=""]&&opts="$opts-F'$FLAGS_messagefile'"
  182. evalgit_dotag$opts"$VERSION_PREFIX$VERSION""$BRANCH"||
  183. die"Taggingfailed.Pleaserunfinishagaintoretry."
  184. fi
  185. fi
  187. #trytomergeintodevelop
  188. #incaseapreviousattempttofinishthisreleasebranchhasfailed,
  189. #butthemergeintodevelopwassuccessful,weskipitnow
  190. if!git_is_branch_merged_into"$BRANCH""$DEVELOP_BRANCH";then
  191. git_docheckout"$DEVELOP_BRANCH"||
  192. die"Couldnotcheckout$DEVELOP_BRANCH."
  194. #TODO:Actually,accountingfor'gitdescribe'pays,soweshould
  195. #ideallygitmerge--no-ff$tagnamehere,instead!
  196. git_domerge--no-ff"$BRANCH"||
  197. die"Thereweremergeconflicts."
  198. #TODO:Whatdowedonow?
  199. fi
  201. #deletebranch
  202. ifnoflagkeep;then
  203. #这个问题很奇怪，在完成分支删除它也会存在当前分支是
  204. #要删除的分支删除报错的问题，所以先切换走
  205. test"$BRANCH"="$(git_current_branch)"&&git_docheckout"$DEVELOP_BRANCH"
  206. git_dobranch-d"$BRANCH"
  207. fi
  209. ifflagpush;then
  210. git_dopush"$ORIGIN""$DEVELOP_BRANCH"||
  211. die"Couldnotpushto$DEVELOP_BRANCHfrom$ORIGIN."
  212. git_dopush"$ORIGIN""$MASTER_BRANCH"||
  213. die"Couldnotpushto$MASTER_BRANCHfrom$ORIGIN."
  214. ifnoflagnotag;then
  215. git_dopush--tags"$ORIGIN"||
  216. die"Couldnotpushtagsto$ORIGIN."
  217. fi
  218. fi
  220. echo
  221. echo"Summaryofactions:"
  222. echo"-Latestobjectshavebeenfetchedfrom'$ORIGIN'"
  223. echo"-Hotfixbranchhasbeenmergedinto'$MASTER_BRANCH'"
  224. ifnoflagnotag;then
  225. echo"-Thehotfixwastagged'$VERSION_PREFIX$VERSION'"
  226. fi
  227. echo"-Hotfixbranchhasbeenback-mergedinto'$DEVELOP_BRANCH'"
  228. ifflagkeep;then
  229. echo"-Hotfixbranch'$BRANCH'isstillavailable"
  230. else
  231. echo"-Hotfixbranch'$BRANCH'hasbeendeleted"
  232. fi
  233. ifflagpush;then
  234. echo"-'$DEVELOP_BRANCH','$MASTER_BRANCH'andtagshavebeenpushedto'$ORIGIN'"
  235. fi
  236. echo
  237. }

相关广告
  • 多master/develop分支如何使用gitflow版本控制 多master/develop分支如何使用gitflow版本控制 多master/develop分支如何使用gitflow版本控制
相关阅读

多master/develop分支如何使用gitflow版本控制

2019/10/10 17:46:33 | 谷歌SEO算法 | 百度K站