Re: git: a1097094c4c5 - main - newvers: Set explicit git revision length

2024-12-19 Thread Ed Maste
Addressing John's other point: > > I guess is that how many other user git settings can affect the build? > > Should > > we not require an empty global git config as a prereq for someone who wants > > a > > reproducible build (and use the same setup for our official builds) and say > > that if

Re: git: a1097094c4c5 - main - newvers: Set explicit git revision length

2024-12-19 Thread Brooks Davis
On Thu, Dec 19, 2024 at 10:03:05AM -0500, John Baldwin wrote: > On 12/18/24 12:12, Gleb Smirnoff wrote: > > On Wed, Dec 18, 2024 at 10:22:24AM -0500, Ed Maste wrote: > > E> That said, it doesn't matter what Git's algorithm chooses as the short > > E> hash length; specifying --short bypasses that al

Re: git: a1097094c4c5 - main - newvers: Set explicit git revision length

2024-12-19 Thread John Baldwin
On 12/18/24 12:12, Gleb Smirnoff wrote: On Wed, Dec 18, 2024 at 10:22:24AM -0500, Ed Maste wrote: E> That said, it doesn't matter what Git's algorithm chooses as the short E> hash length; specifying --short bypasses that algorithm. `git E> rev-parse --verify --short=12 HEAD` will give us a 12-cha

Re: git: a1097094c4c5 - main - newvers: Set explicit git revision length

2024-12-18 Thread Zhenlei Huang
> On Dec 19, 2024, at 5:21 AM, Ed Maste wrote: > > On Wed, 18 Dec 2024 at 12:12, Gleb Smirnoff wrote: >> >> E> The status quo of --short=12 should be fine for quite some time. >> >> AFAIU John's concern is that you can't guarantee a reproducible build from a >> "dirty" repository. A reposi

Re: git: a1097094c4c5 - main - newvers: Set explicit git revision length

2024-12-18 Thread Ed Maste
On Wed, 18 Dec 2024 at 12:12, Gleb Smirnoff wrote: > > E> The status quo of --short=12 should be fine for quite some time. > > AFAIU John's concern is that you can't guarantee a reproducible build from a > "dirty" repository. A repository that has more branches than just the > official > ones.

Re: git: a1097094c4c5 - main - newvers: Set explicit git revision length

2024-12-18 Thread Gleb Smirnoff
On Wed, Dec 18, 2024 at 10:22:24AM -0500, Ed Maste wrote: E> That said, it doesn't matter what Git's algorithm chooses as the short E> hash length; specifying --short bypasses that algorithm. `git E> rev-parse --verify --short=12 HEAD` will give us a 12-character short E> hash as long as that hash

Re: git: a1097094c4c5 - main - newvers: Set explicit git revision length

2024-12-18 Thread Ed Maste
On Mon, 16 Dec 2024 at 18:16, John Baldwin wrote: > > Well, the default --short length is not based on when Git detects a conflict, > it's a function of the total number of objects in a repository. This means > it may be different if you just fetch some other remote with many revisions > in the s

Re: git: a1097094c4c5 - main - newvers: Set explicit git revision length

2024-12-16 Thread John Baldwin
On 12/13/24 19:14, Ed Maste wrote: On Fri, 13 Dec 2024 at 09:53, John Baldwin wrote: On 12/13/24 08:06, Ed Maste wrote: The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a1097094c4c5d810287aca092f4ab5f9f86a426a commit a1097094c4c5d810287aca092f4ab5f9f

Re: git: a1097094c4c5 - main - newvers: Set explicit git revision length

2024-12-13 Thread Ed Maste
On Fri, 13 Dec 2024 at 09:53, John Baldwin wrote: > > On 12/13/24 08:06, Ed Maste wrote: > > The branch main has been updated by emaste: > > > > URL: > > https://cgit.FreeBSD.org/src/commit/?id=a1097094c4c5d810287aca092f4ab5f9f86a426a > > > > commit a1097094c4c5d810287aca092f4ab5f9f86a426a > > Au

Re: git: a1097094c4c5 - main - newvers: Set explicit git revision length

2024-12-13 Thread John Baldwin
On 12/13/24 08:06, Ed Maste wrote: The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a1097094c4c5d810287aca092f4ab5f9f86a426a commit a1097094c4c5d810287aca092f4ab5f9f86a426a Author: Pat Maddox AuthorDate: 2024-12-13 05:28:18 + Commit: Ed Mast

git: a1097094c4c5 - main - newvers: Set explicit git revision length

2024-12-13 Thread Ed Maste
The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a1097094c4c5d810287aca092f4ab5f9f86a426a commit a1097094c4c5d810287aca092f4ab5f9f86a426a Author: Pat Maddox AuthorDate: 2024-12-13 05:28:18 + Commit: Ed Maste CommitDate: 2024-12-13 13:06:10 +0