git-flow tag location on release

classic Classic list List threaded Threaded
6 messages Options
Reply | Threaded
Open this post in threaded view
|

git-flow tag location on release

Ben Vesco
I don't think SmartGit is putting the tag in the correct place for git-flow
with regards to finishing a release. Compare:

[image: Inline image 1]
[image: Inline image 2]

The location of the tag with git-flow cli matches the spec of git flow
here<http://nvie.com/posts/a-successful-git-branching-model/>
.

Thoughts?


[Non-text portions of this message have been removed]

Reply | Threaded
Open this post in threaded view
|

Re: git-flow tag location on release

syntevo Support
> I don't think SmartGit is putting the tag in the correct place for git-flow
> with regards to finishing a release. Compare:
>
> [image: Inline image 1]
> [image: Inline image 2]
>
> The location of the tag with git-flow cli matches the spec of git flow
> here<http://nvie.com/posts/a-successful-git-branching-model/>
> .

I agree that placing the tag on the master's merge commit would me more reasonable (the same holds true for hotfixes). However:

$ git flow release finish

puts the tag on the last branch commit.

--
Best regards,
Marc Strapetz
syntevo GmbH
http://www.syntevo.com
http://blog.syntevo.com


07/17/2013 01:30 - Ben Vesco wrote:

> I don't think SmartGit is putting the tag in the correct place for git-flow
> with regards to finishing a release. Compare:
>
> [image: Inline image 1]
> [image: Inline image 2]
>
> The location of the tag with git-flow cli matches the spec of git flow
> here<http://nvie.com/posts/a-successful-git-branching-model/>
> .
>
> Thoughts?
>
>
> [Non-text portions of this message have been removed]
>
>
Reply | Threaded
Open this post in threaded view
|

Re: git-flow tag location on release

Ben Vesco
My included screenshots, the first is the result of using SmartGit's
"Finish Feature" menu option and the tag is on the release branch while the
second screenshot is the result of running "git flow release finish
firstRelease" on the command line and the tag is put on the master branch.

   - I tried running "git flow release finish" from cli and the command is
   rejected due to missing the final arg of version
   - Running "git flow release finish version" and the tag is *not* on the
   release branch, but on the master branch.
   - The included screenshots in my first post show one tree created
   entirely with SmartGit commands and one tree created entirely with cli
   git-flow (and subsequently opened in SmartGit to show the tree)

Are you using a different or older version of git-flow in your cli tests?
My tests were done with git-flow 0.4.1 which is the latest version.

I maintain that SmartGit is both putting the release tag in the wrong
conceptual location as well as a different location than the git-flow
project itself.



On Wed, Jul 17, 2013 at 1:04 AM, syntevo Support <[hidden email]>wrote:

> **
>
>
> > I don't think SmartGit is putting the tag in the correct place for
> git-flow
> > with regards to finishing a release. Compare:
> >
> > [image: Inline image 1]
> > [image: Inline image 2]
> >
> > The location of the tag with git-flow cli matches the spec of git flow
> > here<http://nvie.com/posts/a-successful-git-branching-model/>
> > .
>
> I agree that placing the tag on the master's merge commit would me more
> reasonable (the same holds true for hotfixes). However:
>
> $ git flow release finish
>
> puts the tag on the last branch commit.
>
> --
> Best regards,
> Marc Strapetz
> syntevo GmbH
> http://www.syntevo.com
> http://blog.syntevo.com
>
>
> 07/17/2013 01:30 - Ben Vesco wrote:
>
> > I don't think SmartGit is putting the tag in the correct place for
> git-flow
> > with regards to finishing a release. Compare:
> >
> > [image: Inline image 1]
> > [image: Inline image 2]
> >
> > The location of the tag with git-flow cli matches the spec of git flow
> > here<http://nvie.com/posts/a-successful-git-branching-model/>
> > .
> >
> > Thoughts?
> >
> >
> > [Non-text portions of this message have been removed]
> >
> >
>
>  
>


[Non-text portions of this message have been removed]



------------------------------------

Yahoo! Groups Links

<*> To visit your group on the web, go to:
    http://groups.yahoo.com/group/smartgit/

<*> Your email settings:
    Individual Email | Traditional

<*> To change settings online go to:
    http://groups.yahoo.com/group/smartgit/join
    (Yahoo! ID required)

<*> To change settings via email:
    [hidden email]
    [hidden email]

<*> To unsubscribe from this group, send an email to:
    [hidden email]

<*> Your use of Yahoo! Groups is subject to:
    http://docs.yahoo.com/info/terms/

Reply | Threaded
Open this post in threaded view
|

Re: git-flow tag location on release

syntevo Support
Ben, attachments are not allowed in the mailing list. Hence no screenshots
were visible.

--
Best regards,
Thomas Singer
=============
syntevo GmbH
http://www.syntevo.com
http://blog.syntevo.com


On 17.07.2013 19:06, Ben Vesco wrote:

> My included screenshots, the first is the result of using SmartGit's
> "Finish Feature" menu option and the tag is on the release branch while the
> second screenshot is the result of running "git flow release finish
> firstRelease" on the command line and the tag is put on the master branch.
>
>     - I tried running "git flow release finish" from cli and the command is
>     rejected due to missing the final arg of version
>     - Running "git flow release finish version" and the tag is *not* on the
>     release branch, but on the master branch.
>     - The included screenshots in my first post show one tree created
>     entirely with SmartGit commands and one tree created entirely with cli
>     git-flow (and subsequently opened in SmartGit to show the tree)
>
> Are you using a different or older version of git-flow in your cli tests?
> My tests were done with git-flow 0.4.1 which is the latest version.
>
> I maintain that SmartGit is both putting the release tag in the wrong
> conceptual location as well as a different location than the git-flow
> project itself.
>
>
>
> On Wed, Jul 17, 2013 at 1:04 AM, syntevo Support <[hidden email]>wrote:
>
>> **
>>
>>
>>> I don't think SmartGit is putting the tag in the correct place for
>> git-flow
>>> with regards to finishing a release. Compare:
>>>
>>> [image: Inline image 1]
>>> [image: Inline image 2]
>>>
>>> The location of the tag with git-flow cli matches the spec of git flow
>>> here<http://nvie.com/posts/a-successful-git-branching-model/>
>>> .
>>
>> I agree that placing the tag on the master's merge commit would me more
>> reasonable (the same holds true for hotfixes). However:
>>
>> $ git flow release finish
>>
>> puts the tag on the last branch commit.
>>
>> --
>> Best regards,
>> Marc Strapetz
>> syntevo GmbH
>> http://www.syntevo.com
>> http://blog.syntevo.com
>>
>>
>> 07/17/2013 01:30 - Ben Vesco wrote:
>>
>>> I don't think SmartGit is putting the tag in the correct place for
>> git-flow
>>> with regards to finishing a release. Compare:
>>>
>>> [image: Inline image 1]
>>> [image: Inline image 2]
>>>
>>> The location of the tag with git-flow cli matches the spec of git flow
>>> here<http://nvie.com/posts/a-successful-git-branching-model/>
>>> .
>>>
>>> Thoughts?
>>>
>>>
>>> [Non-text portions of this message have been removed]
>>>
>>>
>>
>>
>>
>
>
> [Non-text portions of this message have been removed]
>
>
>
> ------------------------------------
>
> Yahoo! Groups Links
>
>
>
>
Reply | Threaded
Open this post in threaded view
|

Re: git-flow tag location on release

Ben Vesco
A ha! So you can't see my fancy graphics :)

Here's another attempt, with them shared on the web.

First, a graph created by smartgit from this
image<https://www.evernote.com/shard/s62/sh/99f87d0a-c9e8-40ee-9cdf-ae0226c18f56/1ff2db561e3d1b97816c8fb0c9bf4893/deep/0/git-flow-smartgit-tag.png>
[image: Inline image 1]

Next, a graph created by git-flow command line from this
image<https://www.evernote.com/shard/s62/sh/b5e01a05-1ce1-4d7f-aec3-13c23417780d/460c51b0af0532c90685a9ac1aa151fc/deep/0/git-flow-cli-tag.png>
[image: Inline image 2]


On Wed, Jul 17, 2013 at 10:44 AM, syntevo Support <[hidden email]>wrote:

> **
>
>
> Ben, attachments are not allowed in the mailing list. Hence no screenshots
> were visible.
>
> --
> Best regards,
> Thomas Singer
> =============
>
> syntevo GmbH
> http://www.syntevo.com
> http://blog.syntevo.com
>
> On 17.07.2013 19:06, Ben Vesco wrote:
> > My included screenshots, the first is the result of using SmartGit's
> > "Finish Feature" menu option and the tag is on the release branch while
> the
> > second screenshot is the result of running "git flow release finish
> > firstRelease" on the command line and the tag is put on the master
> branch.
> >
> > - I tried running "git flow release finish" from cli and the command is
>
> > rejected due to missing the final arg of version
> > - Running "git flow release finish version" and the tag is *not* on the
>
> > release branch, but on the master branch.
> > - The included screenshots in my first post show one tree created
>
> > entirely with SmartGit commands and one tree created entirely with cli
> > git-flow (and subsequently opened in SmartGit to show the tree)
> >
> > Are you using a different or older version of git-flow in your cli tests?
> > My tests were done with git-flow 0.4.1 which is the latest version.
> >
> > I maintain that SmartGit is both putting the release tag in the wrong
> > conceptual location as well as a different location than the git-flow
> > project itself.
> >
> >
> >
> > On Wed, Jul 17, 2013 at 1:04 AM, syntevo Support <[hidden email]
> >wrote:
> >
> >> **
>
> >>
> >>
> >>> I don't think SmartGit is putting the tag in the correct place for
> >> git-flow
> >>> with regards to finishing a release. Compare:
> >>>
> >>> [image: Inline image 1]
> >>> [image: Inline image 2]
> >>>
> >>> The location of the tag with git-flow cli matches the spec of git flow
> >>> here<http://nvie.com/posts/a-successful-git-branching-model/>
> >>> .
> >>
> >> I agree that placing the tag on the master's merge commit would me more
> >> reasonable (the same holds true for hotfixes). However:
> >>
> >> $ git flow release finish
> >>
> >> puts the tag on the last branch commit.
> >>
> >> --
> >> Best regards,
> >> Marc Strapetz
> >> syntevo GmbH
> >> http://www.syntevo.com
> >> http://blog.syntevo.com
> >>
> >>
> >> 07/17/2013 01:30 - Ben Vesco wrote:
> >>
> >>> I don't think SmartGit is putting the tag in the correct place for
> >> git-flow
> >>> with regards to finishing a release. Compare:
> >>>
> >>> [image: Inline image 1]
> >>> [image: Inline image 2]
> >>>
> >>> The location of the tag with git-flow cli matches the spec of git flow
> >>> here<http://nvie.com/posts/a-successful-git-branching-model/>
> >>> .
> >>>
> >>> Thoughts?
> >>>
> >>>
> >>> [Non-text portions of this message have been removed]
> >>>
> >>>
> >>
> >>
> >>
> >
> >
> > [Non-text portions of this message have been removed]
> >
> >
> >
> > ------------------------------------
> >
> > Yahoo! Groups Links
> >
> >
> >
> >
>
>  
>


[Non-text portions of this message have been removed]



------------------------------------

Yahoo! Groups Links

<*> To visit your group on the web, go to:
    http://groups.yahoo.com/group/smartgit/

<*> Your email settings:
    Individual Email | Traditional

<*> To change settings online go to:
    http://groups.yahoo.com/group/smartgit/join
    (Yahoo! ID required)

<*> To change settings via email:
    [hidden email]
    [hidden email]

<*> To unsubscribe from this group, send an email to:
    [hidden email]

<*> Your use of Yahoo! Groups is subject to:
    http://docs.yahoo.com/info/terms/

Reply | Threaded
Open this post in threaded view
|

Re: git-flow tag location on release

syntevo Support
In reply to this post by Ben Vesco
> I maintain that SmartGit is both putting the release tag in the wrong
> conceptual location as well as a different location than the git-flow
> project itself.

SmartGit "is compatible" with the latest Git-Flow version from develop. Contrary to the last released version 0.4.1, which already includes following fix that explains the difference you see:

https://github.com/nvie/gitflow/issues/206

--
Best regards,
Marc Strapetz
syntevo GmbH
http://www.syntevo.com
http://blog.syntevo.com



07/17/2013 19:10 - Ben Vesco wrote:

> My included screenshots, the first is the result of using SmartGit's
> "Finish Feature" menu option and the tag is on the release branch while the
> second screenshot is the result of running "git flow release finish
> firstRelease" on the command line and the tag is put on the master branch.
>
>    - I tried running "git flow release finish" from cli and the command is
>    rejected due to missing the final arg of version
>    - Running "git flow release finish version" and the tag is *not* on the
>    release branch, but on the master branch.
>    - The included screenshots in my first post show one tree created
>    entirely with SmartGit commands and one tree created entirely with cli
>    git-flow (and subsequently opened in SmartGit to show the tree)
>
> Are you using a different or older version of git-flow in your cli tests?
> My tests were done with git-flow 0.4.1 which is the latest version.
>
> I maintain that SmartGit is both putting the release tag in the wrong
> conceptual location as well as a different location than the git-flow
> project itself.
>
>
>
> On Wed, Jul 17, 2013 at 1:04 AM, syntevo Support <[hidden email]>wrote:
>
> > **
> >
> >
> > > I don't think SmartGit is putting the tag in the correct place for
> > git-flow
> > > with regards to finishing a release. Compare:
> > >
> > > [image: Inline image 1]
> > > [image: Inline image 2]
> > >
> > > The location of the tag with git-flow cli matches the spec of git flow
> > > here<http://nvie.com/posts/a-successful-git-branching-model/>
> > > .
> >
> > I agree that placing the tag on the master's merge commit would me more
> > reasonable (the same holds true for hotfixes). However:
> >
> > $ git flow release finish
> >
> > puts the tag on the last branch commit.
> >
> > --
> > Best regards,
> > Marc Strapetz
> > syntevo GmbH
> > http://www.syntevo.com
> > http://blog.syntevo.com
> >
> >
> > 07/17/2013 01:30 - Ben Vesco wrote:
> >
> > > I don't think SmartGit is putting the tag in the correct place for
> > git-flow
> > > with regards to finishing a release. Compare:
> > >
> > > [image: Inline image 1]
> > > [image: Inline image 2]
> > >
> > > The location of the tag with git-flow cli matches the spec of git flow
> > > here<http://nvie.com/posts/a-successful-git-branching-model/>
> > > .
> > >
> > > Thoughts?
> > >
> > >
> > > [Non-text portions of this message have been removed]
> > >
> > >
> >
> >  
> >
>
>
> [Non-text portions of this message have been removed]
>
>
>
> ------------------------------------
>
> Yahoo! Groups Links
>
>
>
>