Merge: put log tags into commits #2
Conversation
Instead of 'This is {tags} the stable released'
this will input tag logs into merge-commits.
* but not sure this will works on others, but mine works well.
|
I have this in my personal script but I haven't really wanted to force this on people, some people prefer the default |
| @@ -24,6 +24,7 @@ GRN="\033[01;32m" | |||
| RED="\033[01;31m" | |||
| RST="\033[0m" | |||
| YLW="\033[01;33m" | |||
| branch=$(git branch | grep \* | cut -d ' ' -f2) | |||
There was a problem hiding this comment.
git rev-parse --abbrev-ref HEAD is a cleaner way to do this
| @@ -245,12 +249,14 @@ git add . && git cherry-pick --continue" | |||
| fi ;; | |||
|
|
|||
| "merge") | |||
| if ! GIT_MERGE_VERBOSITY=1 git merge --no-edit "v${TARGET_VERSION}"; then | |||
| if ! GIT_MERGE_VERBOSITY=1 git merge --edit -m "Merge ${TARGET_VERSION} into ${branch}" -m "Changes in ${TARGET_VERSION}: ($(git status | grep commits | cut -d ' ' -f8-9 | head -n1 | sed 's/commits./commits/'))" -m "$(tag_logs)" "v${TARGET_VERSION}" --no-edit; then | |||
There was a problem hiding this comment.
Kill the boilerplate (this exact same message is used in both places) and make a function like in my own script (create_merge_message, append_conflicts).
The git aliases can be viewed here for translation.
There was a problem hiding this comment.
didn't check your personal scripts before, i just saw your commits on als repo xD, almost exact same
thanks
There was a problem hiding this comment.
Yeah didn't expect you to :P if you feel like adapting it for here, by all means feel free!
| @@ -232,6 +233,9 @@ function generate_versions() { | |||
| echo | |||
| } | |||
|
|
|||
| function tag_logs() { | |||
| @@ -232,6 +233,9 @@ function generate_versions() { | |||
| echo | |||
| } | |||
|
|
|||
| function tag_logs() { | |||
| git log --oneline --pretty=format:' %s' v${CURRENT_VERSION}..v${TARGET_VERSION} | |||
There was a problem hiding this comment.
v${CURRENT_VERSION}..v${TARGET_VERSION} = ${RANGE}
|
also the calculated number of commits should be this it's more cleaner ways |
|
Yes, I noticed that after the second review and decided against a third review comment haha |
Instead of 'This is {tags} the stable released'
this will input tag logs into merge-commits.