Re: [Dnsmasq-discuss] Snapshot archives downloaded from gitweb are not versioned properly

2022-09-14 Thread Simon Kelley
Playing with this, going the other way and moving to just using %(describe) is good, since it vastly simplifies things. The problem is that %(describe) is rather new, and as solving this problem means solving it on thekelleys.org.uk, which is running Debian stable, the yak has now morphed

Re: [Dnsmasq-discuss] Snapshot archives downloaded from gitweb are not versioned properly

2022-09-13 Thread Simon Kelley
On 13/09/2022 09:10, Johnny S. Lee via Dnsmasq-discuss wrote: How about something like the following? diff --git a/VERSION b/VERSION index 998eb1f..29a22f8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -$Format:%d$ +$Format:%d;%(describe)$ diff --git a/bld/get-version b/bld/get-version

Re: [Dnsmasq-discuss] Snapshot archives downloaded from gitweb are not versioned properly

2022-09-13 Thread Johnny S. Lee via Dnsmasq-discuss
How about something like the following? diff --git a/VERSION b/VERSION index 998eb1f..29a22f8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -$Format:%d$ +$Format:%d;%(describe)$ diff --git a/bld/get-version b/bld/get-version index 1f51768..4ba3646 100755 --- a/bld/get-version +++

Re: [Dnsmasq-discuss] Snapshot archives downloaded from gitweb are not versioned properly

2022-09-12 Thread Johnny S. Lee via Dnsmasq-discuss
> I'm not clear what the difference between that and %(describe) is. The > substituted value is used subtly in get-version as part of the > build-process, so we need to be a little careful about changing things. $ git log -10 --format="'%d'" ' (HEAD -> master, origin/master, origin/HEAD)' ' (tag:

Re: [Dnsmasq-discuss] Snapshot archives downloaded from gitweb are not versioned properly

2022-09-12 Thread Simon Kelley
The current format is %d, which is "ref names, like the --decorate option of git-log[1]" according to git help log. I'm not clear what the difference between that and %(describe) is. The substituted value is used subtly in get-version as part of the build-process, so we need to be a little

Re: [Dnsmasq-discuss] Snapshot archives downloaded from gitweb are not versioned properly

2022-09-12 Thread Geert Stappers via Dnsmasq-discuss
On Mon, Sep 12, 2022 at 04:51:26PM +0800, Johnny S. Lee via Dnsmasq-discuss wrote: > On Mon, 12 Sept 2022 at 15:22, wrote: > > On Mon, 12 Sep 2022 08:26:14 +0200 Geert Stappers via Dnsmasq-discuss wrote: > > > On Mon, Sep 12, 2022 at 11:51:22AM +0800, Johnny S. Lee via > > > Dnsmasq-discuss

Re: [Dnsmasq-discuss] Snapshot archives downloaded from gitweb are not versioned properly

2022-09-12 Thread Johnny S. Lee via Dnsmasq-discuss
> How often is the VERSION file changed? It changes from "(HEAD -> master)" to blank when there is a new commit. Checksum of the archive of the same commit probably changes too. > Is the VERSION file meaningful only at the time of a release and can change > 'drastically' between releases? It's

Re: [Dnsmasq-discuss] Snapshot archives downloaded from gitweb are not versioned properly

2022-09-12 Thread imnozi
On Mon, 12 Sep 2022 08:26:14 +0200 Geert Stappers via Dnsmasq-discuss wrote: > Hello Johnny, > ( Cc: dnsmasq-discuss@lists.thekelleys.org.uk ) > > > On Mon, Sep 12, 2022 at 11:51:22AM +0800, Johnny S. Lee via Dnsmasq-discuss > wrote: > > The contents of file VERSION from the tar.gz files of

Re: [Dnsmasq-discuss] Snapshot archives downloaded from gitweb are not versioned properly

2022-09-12 Thread Johnny S. Lee via Dnsmasq-discuss
Hello Geert, On Mon, 12 Sept 2022 at 14:26, Geert Stappers wrote: > > Hello Johnny, > ( Cc: dnsmasq-discuss@lists.thekelleys.org.uk ) > > > On Mon, Sep 12, 2022 at 11:51:22AM +0800, Johnny S. Lee via Dnsmasq-discuss > wrote: > > The contents of file VERSION from the tar.gz files of the latest 3

Re: [Dnsmasq-discuss] Snapshot archives downloaded from gitweb are not versioned properly

2022-09-12 Thread Geert Stappers via Dnsmasq-discuss
Hello Johnny, ( Cc: dnsmasq-discuss@lists.thekelleys.org.uk ) On Mon, Sep 12, 2022 at 11:51:22AM +0800, Johnny S. Lee via Dnsmasq-discuss wrote: > The contents of file VERSION from the tar.gz files of the latest 3 commits: > > dnsmasq-c4b9bc6/VERSION: (HEAD -> master) >