How does the final git-flow (release) flow work?

Asked

Viewed 373 times

0

Briefly (consider using git-flow): I created a repository, managed my Feature, created a release, finished this release, consulted the log of the develop branch and had as output:

commit a6676da74f99342dd85e50e1251fd662d0be2680
Merge: 2c4958f 82190a0
Author: Your Name <[email protected]>
Date:   Wed Apr 11 19:13:37 2018 +0000

    Merge tag 'v1.0.0' into develop

    v1.0.0

commit 82190a041c9b3909a94fc74f47675fe0cae0d5de
Merge: f09850e 2c4958f
Author: Your Name <[email protected]>
Date:   Wed Apr 11 19:13:28 2018 +0000

    Merge branch 'release/v1.0.0'

From what I understand the commit 82190a041c9b3909a94fc74f47675fe0cae0d5de is the merge of the release branch, now a6676da74f99342dd85e50e1251fd662d0be2680 would be a merge of the commit referenced by the v1.0.0 tag, this understanding is correct?

git git-flow

1 answer

1


After performing some tests I was able to define that this is it.

When a git flow release finish <identificador da release> is executed, some of the actions fired are:

  • Execute a merge --no-ff release/<identificador da release> in the master and generated a tag with the <identificador da release>
  • In sequence a merge --no-ff release/<identificador da release> and merge --no-ff <hash do commit referenciado pela tag> is applied in the develop...

When inspecting the commit below (most recent branch commit develop after release Finish) I was able to find 2 hash (dffb709 and 9d6b578), one for the commit referenced by the tag in the master branch and the other for the most recent commit in develop.

$ git show a6676da74f99342dd85e50e1251fd662d0be2680 commit 214157701f6cbe4f66d1802f9a93089d74aa45c6 (HEAD -> develop) Merge: dffb709 9d6b578 Author: Your Name <[email protected]> Date:   Wed Apr 11 18:36:39 2018 -0300

    Merge tag 'v1.0.0' into develop

    v1.0.0 primeira versão estavel

Browser other questions tagged git git-flow

You are not signed in. Login or sign up in order to post.