Re: git and the loss of revision numbers

2020-12-30 Thread Ulrich Spörlein
On Mon, 2020-12-28 at 19:38:05 -0500, monochrome wrote: what would be the git command for reverting source to a previous version using these numbers? for example, with svn and old numbers: svnlite update -r367627 /usr/src this is needed often when it blows up for someone tracking current You

Re: git and the loss of revision numbers

2020-12-30 Thread Ulrich Spörlein
On Mon, 2020-12-28 at 17:06:26 -0800, David Wolfskill wrote: On Mon, Dec 28, 2020 at 04:56:39PM -0800, John-Mark Gurney wrote: monochrome wrote this message on Mon, Dec 28, 2020 at 19:38 -0500: > what would be the git command for reverting source to a previous version > using these numbers? for

Re: git and the loss of revision numbers

2020-12-29 Thread John Baldwin
On 12/29/20 7:11 AM, monochrome wrote: > ok, this appears to be what I was looking for > > example: > git reset --hard f20c0e331 > then: > git pull --ff-only > is again able to update as normal > > I should point out also that this is from the point of view of any > random person just building

Re: git and the loss of revision numbers

2020-12-29 Thread Guido Falsi
On 29/12/20 18:38, Andriy Gapon wrote: On 2020-12-29 17:11, monochrome wrote: ok, this appears to be what I was looking for example: git reset --hard f20c0e331 then: git pull --ff-only is again able to update as normal I should point out also that this is from the point of view of any random

Re: git and the loss of revision numbers

2020-12-29 Thread Andriy Gapon
On 2020-12-29 17:11, monochrome wrote: > ok, this appears to be what I was looking for > > example: > git reset --hard f20c0e331 > then: > git pull --ff-only > is again able to update as normal > > I should point out also that this is from the point of view of any > random person just building

Re: git and the loss of revision numbers

2020-12-29 Thread Christian Weisgerber
monochrome: > the g is also in the uname output: > > main-c421-gf20c0e331-dirty It's the brand new format: -c-g[-dirty] https://cgit.freebsd.org/src/commit/sys/conf/newvers.sh?id=8d405efd73d3991fe1647f91a2b7c9989dd5f18f -- Christian "naddy" Weisgerber

Re: git and the loss of revision numbers

2020-12-29 Thread monochrome
ok, this appears to be what I was looking for example: git reset --hard f20c0e331 then: git pull --ff-only is again able to update as normal I should point out also that this is from the point of view of any random person just building freebsd from source, not a developer, so there are no

Re: git and the loss of revision numbers

2020-12-29 Thread Andriy Gapon
On 2020-12-29 02:56, Pete Wright wrote: > > On 12/28/20 4:38 PM, monochrome wrote: >> what would be the git command for reverting source to a previous >> version using these numbers? for example, with svn and old numbers: >> svnlite update -r367627 /usr/src >> > I will generally just checkout the

Re: git and the loss of revision numbers

2020-12-29 Thread monochrome
On 12/29/20 7:15 AM, Kristof Provost wrote: On 29 Dec 2020, at 4:33, monochrome wrote: sry forgot details: source tree @ ead01bfe8 git -C /usr/src checkout gf20c0e331 error: pathspec 'gf20c0e331' did not match any file(s) known to git what is the 'g' for? That would have been a typo, I

Re: git and the loss of revision numbers

2020-12-29 Thread Kristof Provost
On 29 Dec 2020, at 4:33, monochrome wrote: sry forgot details: source tree @ ead01bfe8 git -C /usr/src checkout gf20c0e331 error: pathspec 'gf20c0e331' did not match any file(s) known to git what is the 'g' for? That would have been a typo, I think. git -C /usr/src checkout f20c0e331 M

Re: git and the loss of revision numbers

2020-12-28 Thread monochrome
sry forgot details: source tree @ ead01bfe8 git -C /usr/src checkout gf20c0e331 error: pathspec 'gf20c0e331' did not match any file(s) known to git what is the 'g' for? git -C /usr/src checkout f20c0e331 M sys/amd64/conf/GENERIC HEAD is now at f20c0e331 caroot: drop $FreeBSD$ expansion

Re: git and the loss of revision numbers

2020-12-28 Thread monochrome
this didn't seem to work, and now git is saying: You are not currently on a branch. since the incremental numbers aren't in the git log does it make more sense to use the short hash like this? other different responses were focused on the incremental commit number. Also, I saw someone mention

Re: git and the loss of revision numbers

2020-12-28 Thread David Wolfskill
On Mon, Dec 28, 2020 at 04:56:39PM -0800, John-Mark Gurney wrote: > monochrome wrote this message on Mon, Dec 28, 2020 at 19:38 -0500: > > what would be the git command for reverting source to a previous version > > using these numbers? for example, with svn and old numbers: > > svnlite update

Re: git and the loss of revision numbers

2020-12-28 Thread John-Mark Gurney
monochrome wrote this message on Mon, Dec 28, 2020 at 19:38 -0500: > what would be the git command for reverting source to a previous version > using these numbers? for example, with svn and old numbers: > svnlite update -r367627 /usr/src > > this is needed often when it blows up for someone

Re: git and the loss of revision numbers

2020-12-28 Thread Pete Wright
On 12/28/20 4:38 PM, monochrome wrote: what would be the git command for reverting source to a previous version using these numbers? for example, with svn and old numbers: svnlite update -r367627 /usr/src I will generally just checkout the short git hash like so in my local checkout: $ git

Re: git and the loss of revision numbers

2020-12-28 Thread monochrome
what would be the git command for reverting source to a previous version using these numbers? for example, with svn and old numbers: svnlite update -r367627 /usr/src this is needed often when it blows up for someone tracking current On 12/28/20 11:27 AM, Ed Maste wrote: On Mon, 28 Dec 2020 at

Re: git and the loss of revision numbers

2020-12-28 Thread Ed Maste
On Mon, 28 Dec 2020 at 07:08, Renato Botelho wrote: > > FreeBSD bast.garga.net.br 13.0-CURRENT FreeBSD 13.0-CURRENT #19 > 3cc0c0d66a0-c255241(main)-dirty: > ^ > This is an incremental counter of commits Also, uqs@ recently fixed an issue in newvers.sh (including the

Re: git and the loss of revision numbers

2020-12-28 Thread Renato Botelho
On 24/12/20 11:15, Michael Grimm wrote: Correction: On 24. Dec 2020, at 15:11, Michael Grimm wrote: In the past I could easily judge if there was a need to buildworld or buildkernel: If uname shows a larger revision number than those in advisories or notices. In the past I could easily

Re: git and the loss of revision numbers

2020-12-25 Thread Michael Grimm
Christian Weisgerber wrote: > > Michael Grimm: >> Correct? If so I wonder how future security advisories and errata notices >> will be composed. Will there be a date of the commit besides its hash being >> reported? > > For over TWENTY YEARS, FreeBSD advisories have already contained > the

Re: git and the loss of revision numbers

2020-12-24 Thread Thomas Mueller
> Disclaimer: I just started to learn git, never used it before. > If I do understand it correctly, the switch from svn to git comes with a loss > of continuously increasing revision numbers. Correct? If so I wonder how > future security advisories and errata notices will be composed. Will

Re: git and the loss of revision numbers

2020-12-24 Thread Christian Weisgerber
Michael Grimm: > If I do understand it correctly, the switch from svn to git comes with a loss > of continuously increasing revision numbers. Correct. > Correct? If so I wonder how future security advisories and errata notices > will be composed. Will there be a date of the commit besides its

Re: git and the loss of revision numbers

2020-12-24 Thread grarpamp
> loss of continuously increasing revision numbers git rev-list --count HEAD git describe --tags / parent Plus a bunch of similar ways to do it, from different points, in different formats, search internet for them all... git revision version numbering... Some deploy structured metadata in tag

Re: git and the loss of revision numbers

2020-12-24 Thread Michael Grimm
Correction: > On 24. Dec 2020, at 15:11, Michael Grimm wrote: > > In the past I could easily judge if there was a need to buildworld or > buildkernel: If uname shows a larger revision number than those in advisories > or notices. In the past I could easily judge if there was a need to