On 13/07/2016 11:11, Jonas Gorski wrote: > Hi John, > > On 13 July 2016 at 09:39, John Crispin <j...@phrozen.org> wrote: >> Hi Jonas, >> Hi Felix, >> >> your recent changes to getver.sh are causing a regression when not >> building inside trunk but inside a staging tree >> >> blogic@debian:/lede/staging$ ./scripts/getver.sh >> warning: refname 'origin/master' is ambiguous. >> r411+546 >> blogic@debian:/lede/staging$ git branch >> * master >> origin/master > > I don't think you should have a branch called "origin/master" - this > is what confuses git. Generally having branches that start with remote > names sound like they could cause issues later on. > > > Regards > Jonas >
i have 2 remotes, the master and my staging tree. this is a typical setup i guess ? John _______________________________________________ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev