Re: [PATCH] git-version-gen: Support git-archive tarballs.

2024-12-28 Thread Simon Josefsson via Gnulib discussion list
Thanks -- I agree avoiding 'grep' is nice, I pushed this change inspired by your approach. /Simon From 83c5387249b5bbfd32d01a51af14ac53bac1bc36 Mon Sep 17 00:00:00 2001 From: Simon Josefsson Date: Sat, 28 Dec 2024 21:19:18 +0100 Subject: [PATCH] git-version-gen: avoid use of grep, suggested by Ji

Re: [PATCH] git-version-gen: Support git-archive tarballs.

2024-12-28 Thread Jim Meyering
On Sat, Dec 28, 2024 at 11:26 AM Simon Josefsson wrote: > > Jim Meyering writes: > > > On Sat, Dec 28, 2024 at 10:01 AM Simon Josefsson > > wrote: > >> Jim Meyering writes: > >> > >> >> if test "x$v" = xUNKNOWN \ > >> >> && test -f ${tarball_version_file}-git \ > >> >> && head

Re: [PATCH] git-version-gen: Support git-archive tarballs.

2024-12-28 Thread Simon Josefsson via Gnulib discussion list
Jim Meyering writes: > On Sat, Dec 28, 2024 at 10:01 AM Simon Josefsson wrote: >> Jim Meyering writes: >> >> >> if test "x$v" = xUNKNOWN \ >> >> && test -f ${tarball_version_file}-git \ >> >> && head -1 ${tarball_version_file}-git \ >> >> | grep -v '^$Format' > /dev/

Re: [PATCH] git-version-gen: Support git-archive tarballs.

2024-12-28 Thread Jim Meyering
On Sat, Dec 28, 2024 at 10:01 AM Simon Josefsson wrote: > Jim Meyering writes: > > >> if test "x$v" = xUNKNOWN \ > >> && test -f ${tarball_version_file}-git \ > >> && head -1 ${tarball_version_file}-git \ > >> | grep -v '^$Format' > /dev/null 2>&1; then > >> v=$(he

Re: [PATCH] git-version-gen: Support git-archive tarballs.

2024-12-28 Thread Simon Josefsson via Gnulib discussion list
Simon Josefsson via Gnulib discussion list writes: > --- a/top/maint.mk > +++ b/top/maint.mk Please disregard that part, it is an unrelated the change for a completely different problem and I'm still experimenting with that patch to see if it is the right one... /Simon signature.asc Descripti

Re: [PATCH] git-version-gen: Support git-archive tarballs.

2024-12-28 Thread Simon Josefsson via Gnulib discussion list
Jim Meyering writes: >> if test "x$v" = xUNKNOWN \ >> && test -f ${tarball_version_file}-git \ >> && head -1 ${tarball_version_file}-git \ >> | grep -v '^$Format' > /dev/null 2>&1; then >> v=$(head -1 ${tarball_version_file}-git) >> fi > > That code uses "grep -v"

Re: [PATCH] git-version-gen: Support git-archive tarballs.

2024-12-28 Thread Jim Meyering
Oops. Thank you. Hmm... it shouldn't be hard to make vc-dwim do the right thing by default for projects like gnulib that VC their ChangeLog file. On Sat, Dec 28, 2024 at 9:46 AM Bruno Haible wrote: > > Jim Meyering wrote: > > I've fixed that and cleaned up via this just-pushed change: > > I've a

Re: [PATCH] git-version-gen: Support git-archive tarballs.

2024-12-28 Thread Bruno Haible via Gnulib discussion list
Jim Meyering wrote: > I've fixed that and cleaned up via this just-pushed change: I've added the mandatory ChangeLog entry for your change. Bruno

Re: [PATCH] git-version-gen: Support git-archive tarballs.

2024-12-28 Thread Jim Meyering
On Fri, Dec 27, 2024 at 3:35 AM Simon Josefsson wrote: > Hi Jim, all, Hi Simon, > If I run git-version-gen in a snapshot of a git repository it will > return UNKNOWN because it cannot find out the version. > > Git has a .gitattribute mechanism to mark some files as 'export-subst' > which makes g

Re: [PATCH] git-version-gen: Support git-archive tarballs.

2024-12-27 Thread Simon Josefsson via Gnulib discussion list
Bruno Haible via Gnulib discussion list writes: > Hi Simon, > > Would you mind adding a ChangeLog entry for this commit? Sorry about that, fixed now! /Simon signature.asc Description: PGP signature

Re: [PATCH] git-version-gen: Support git-archive tarballs.

2024-12-27 Thread Bruno Haible via Gnulib discussion list
Hi Simon, Would you mind adding a ChangeLog entry for this commit? Bruno

[PATCH] git-version-gen: Support git-archive tarballs.

2024-12-27 Thread Simon Josefsson via Gnulib discussion list
7e245aa7edcb779d6b0579c9bcbdf18 Mon Sep 17 00:00:00 2001 From: Simon Josefsson Date: Fri, 27 Dec 2024 10:44:16 +0100 Subject: [PATCH] git-version-gen: Support git-archive tarballs. * build-aux/git-version-gen: Use .tarball-version-git as final guess. --- build-aux/git-version-gen | 37 ++