Gitflow: ๊ธฐ๋Šฅ ๋ถ„๊ธฐ ์ด๋ฆ„์— ๋”ํ•˜๊ธฐ ๊ธฐํ˜ธ

์— ๋งŒ๋“  2011๋…„ 08์›” 24์ผ  ยท  6์ฝ”๋ฉ˜ํŠธ  ยท  ์ถœ์ฒ˜: nvie/gitflow

'feature/google+' ๋ผ๋Š” ๊ธฐ๋Šฅ ๋ถ„๊ธฐ๊ฐ€ ์žˆ์—ˆ๋Š”๋ฐ ๋ถˆํ–‰ํžˆ๋„ git flow ๋ช…๋ น ์ค‘ ์–ด๋Š ๊ฒƒ๋„ ์ฐพ์„ ์ˆ˜ ์—†์—ˆ์Šต๋‹ˆ๋‹ค. ๋‚˜๋Š” ํ•ญ์ƒ ์–ป์—ˆ๋‹ค:
_'feature/google+' ๋ถ„๊ธฐ๊ฐ€ ์กด์žฌํ•˜์ง€ ์•Š์œผ๋ฉฐ ํ•„์ˆ˜์ž…๋‹ˆ๋‹ค._

grep ๋˜๋Š” sth์— ๋ฌธ์ œ๊ฐ€ ์žˆ์„ ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค. ๋ถ„๊ธฐ ์ด๋ฆ„์— ํ—ˆ์šฉ๋˜์ง€๋งŒ git ํ๋ฆ„์— ์˜ํ•ด ํฌ์ฐฉ๋˜์ง€ ์•Š๋Š” ๋‹ค๋ฅธ ๋ฌธ์ž๋„ ํ™•์ธํ•˜๋Š” ๊ฒƒ์ด ์ข‹์Šต๋‹ˆ๋‹ค.

๋ฌธ์•ˆ ์ธ์‚ฌ
๋ฏธํ• 

๋ชจ๋“  6 ๋Œ“๊ธ€

Git์€ +๋ฅผ ์ง€์›ํ•˜๋ฏ€๋กœ gitflow์—๋งŒ ํ•ด๋‹น๋ฉ๋‹ˆ๋‹ค.

git branch 'google+'

๊ฐ™์€ ๋ฌธ์ œ์ž…๋‹ˆ๋‹ค. "+" ๋ฌธ์ž๋Š” gitflow์—์„œ ์ž‘๋™ํ•˜์ง€ ์•Š์Šต๋‹ˆ๋‹ค.
git ํ๋ฆ„ ๋ฆด๋ฆฌ์Šค ์‹œ์ž‘ 1.0+1.1b1 ์ž‘๋™
git flow release finish 1.0+1.1b1์€ ๋ถ„๊ธฐ 'release/1.0+1.1b1'์ด ์กด์žฌํ•˜์ง€ ์•Š๊ณ  ํ•„์š”ํ•˜๋‹ค๊ณ  ๋งํ•ฉ๋‹ˆ๋‹ค.
๋ธŒ๋žœ์น˜ ์ด๋ฆ„์„ release/1.0_1.1b1๋กœ ๋ณ€๊ฒฝํ•˜๊ณ  ๋ฆด๋ฆฌ์Šค๋ฅผ ์™„๋ฃŒํ•˜๊ณ  1.0+1.1b1์ด๋ผ๋Š” ์ข‹์€ ์ด๋ฆ„์œผ๋กœ ๋‹ค๋ฅธ ํƒœ๊ทธ๋ฅผ ๋งŒ๋“ค๊ณ  ๋‹ค๋ฅธ ํƒœ๊ทธ๋ฅผ ์‚ญ์ œํ•ด์•ผ ํ•ฉ๋‹ˆ๋‹ค. ์•ฝ๊ฐ„ ์‹ค๋ง;;

์ž‘์—…ํ•ด์ฃผ์…”์„œ ๊ฐ์‚ฌํ•ฉ๋‹ˆ๋‹ค!

์—ฌ๊ธฐ์— ๊ฐ™์€ ๋ฌธ์ œ๊ฐ€ ์žˆ์Šต๋‹ˆ๋‹ค. ์ด๊ฒƒ์€ ์—ฌ์ „ํžˆ โ€‹โ€‹โ€‹โ€‹์ˆ˜์ •๋˜์ง€ ์•Š์€ ๊ฒƒ ๊ฐ™์Šต๋‹ˆ๋‹ค. @pyby ์˜ ํ•ด๊ฒฐ ๋ฐฉ๋ฒ•์„ ์‚ฌ์šฉํ•˜๋ฉด ํšจ๊ณผ๊ฐ€ ์žˆ๋Š” ๊ฒƒ ๊ฐ™์ง€๋งŒ ์•ฝ๊ฐ„ ํ•ดํ‚คํ•ฉ๋‹ˆ๋‹ค.

์ด๊ฒƒ์„ ์ฐธ์กฐํ•  ๊ฐ€์น˜๊ฐ€ ์žˆ๋Š” ๊ฒƒ์€ ๋‹ค์Œ๊ณผ ๊ฐ™์€ ๋ฐฉ๋ฒ•์œผ๋กœ ์ˆ˜ํ–‰ํ•˜๋ ค๋Š” ๊ฒฝ์šฐ์ž…๋‹ˆ๋‹ค.

๋ฐฉ๊ธˆ ํ•จ์ •์„ ๋ฐŸ์•˜์Šต๋‹ˆ๋‹ค... ์ด ๋ฌธ์ œ๊ฐ€ ๊ณง ์ˆ˜์ •๋  ์ˆ˜ ์žˆ๊ธฐ๋ฅผ ๋ฐ”๋ž๋‹ˆ๋‹ค. ๋”ํ•˜๊ธฐ ๊ธฐํ˜ธ๋Š” semver ์‚ฌ์–‘๋‹น ๋ฒ„์ „ ๋ฒˆํ˜ธ์— ๋นŒ๋“œ ์ •๋ณด๋ฅผ ์ถ”๊ฐ€ํ•˜๋Š” ์œ ํšจํ•œ ๋ฐฉ๋ฒ•์ž…๋‹ˆ๋‹ค.

:+1:

๋‹ค์Œ ํŒจ์น˜๋Š” ๋‚˜๋ฅผ ์œ„ํ•ด ์ˆ˜์ •ํ–ˆ์Šต๋‹ˆ๋‹ค.

--- /usr/local/Cellar/git-flow/0.4.1/libexec/bin/gitflow-common.orig    2017-10-05 20:35:16.000000000 -0500
+++ /usr/local/Cellar/git-flow/0.4.1/libexec/bin/gitflow-common 2017-10-05 20:35:03.000000000 -0500
@@ -50,7 +50,15 @@ escape() {

 # set logic
 has() {
-       echo " $@ " | grep -q " $(escape $item) "
+       local item=$1; shift
+       for s in $@; do
+               if [ "$item" = "$s" ]; then
+                       return 0
+               fi
+       done
+       return 1
+        # the following code has issues with + in the branch names
+       #echo " $@ " | grep -q " $(escape $item) "
 }

 # basic math
์ด ํŽ˜์ด์ง€๊ฐ€ ๋„์›€์ด ๋˜์—ˆ๋‚˜์š”?
0 / 5 - 0 ๋“ฑ๊ธ‰