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

[Denis OSTERLAND <denis.osterland@diehl.com>]

Hi,

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.

> 
> 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.

> 
> Maybe a patch that allows to overwrite setlocalversion in the BSP?
> 
> Michael

Regards Denis

Diehl Connectivity Solutions GmbH
Geschäftsführung: Horst Leonberger
Sitz der Gesellschaft: Nürnberg - Registergericht: Amtsgericht
Nürnberg: HRB 32315
___________________________________________________________________________________________________

Der Inhalt der vorstehenden E-Mail ist nicht rechtlich bindend. Diese E-Mail enthaelt vertrauliche und/oder rechtlich geschuetzte Informationen.
Informieren Sie uns bitte, wenn Sie diese E-Mail faelschlicherweise erhalten haben. Bitte loeschen Sie in diesem Fall die Nachricht.
Jede unerlaubte Form der Reproduktion, Bekanntgabe, Aenderung, Verteilung und/oder Publikation dieser E-Mail ist strengstens untersagt.
The contents of the above mentioned e-mail is not legally binding. This e-mail contains confidential and/or legally protected information. Please inform us if you have received this e-mail by
mistake and delete it in such a case. Each unauthorized reproduction, disclosure, alteration, distribution and/or publication of this e-mail is strictly prohibited. 
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de