Re: [ptxdist] [PATCH] setlocalversion: only use tags actually on current branch

[Michael Olbrich <m.olbrich@pengutronix.de>]

Hi,

On Wed, Dec 12, 2018 at 02:35:45PM +0000, Denis OSTERLAND wrote:
> Am Mittwoch, den 12.12.2018, 14:51 +0100 schrieb Michael Olbrich:
> > On Wed, Dec 12, 2018 at 09:14:52AM +0000, Denis OSTERLAND wrote:
> > > 
> > > Consider following situation:
> > > 
> > >                            tag C
> > >                              v
> > >                      A---B---C topic
> > >                     /         \
> > >                D---E---F---G---H master
> > >                    ^
> > >                  tag E
> > > 
> > > PTXDIST_BSP_AUTOVERSION at commit G will be E-2-gXXXX,
> > > but at commit H it will be C-3-gXXXX.
> > > With --first-parent it will be E-3-gXXXX.
> > > This is more intuitive result,
> > > especially when more than just one branch gets merged.
> > Nack. This only works with explicit merges. If multiple people update the
> > branch with git pull/push, then the first parent may not be the upstream
> > commit and the correct tag may be missed.
> I am not sure if I got the point here.
> 
> Is this your concern:
>                            tag C
>                              v
>                      A---B---C origin/master
>                     /         \
>                D---E---F---G---H master
> 
> and now when pushing master to origin C becomes invisible.

Exactly, and that is not acceptable in general.

> > In your example above consider 'C' the HEAD of the local master branch
> > before a pull/push. Then the first parent of 'H' is 'C'. And a if 'F' is
> > the tag, then it is ignored.
> The branches are equal, so of course yes.
> 
> If I got you right:
> 
>               tag C
>                 v
>         A---B---C---H topic
>        /           /
>   D---E---F-------G master
>           ^
>         tag F
> 
> At G it is F-1-gXXXX.
> At H it is C-3-gXXXX and C-1-gXXXX with --first-parent.
> 
> Seems to be correct behavior to me.

I'm not sure what your point is here.

Michael

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de