diff options
| author | Jason A. Dönerfield <no-replay@sl0p.foo> | 2026-07-18 21:17:58 +0200 |
|---|---|---|
| committer | Jason A. Dönerfield <no-replay@sl0p.foo> | 2026-07-18 21:31:00 +0200 |
| commit | 79054faaadd5d6773f79baf4cdca515b0c73944b (patch) | |
| tree | 0e5b000b77cce98cac74cdb291bff43b23e1d4fb | |
| parent | ui-shared: signal the sl0p fork in the footer + generator meta (diff) | |
| download | cgit-79054faaadd5d6773f79baf4cdca515b0c73944b.tar.gz cgit-79054faaadd5d6773f79baf4cdca515b0c73944b.tar.xz cgit-79054faaadd5d6773f79baf4cdca515b0c73944b.zip | |
build: fix empty version on tagless clones; mark version -sl0p
gen-version.sh unconditionally overwrote the Makefile-provided version
with `git describe` output, which is empty on a plain clone of the fork
(no tags) — so cgit_version rendered blank in the footer and generator
meta. Only override when describe yields something. Also bump the base
version to v1.3.1-sl0p so the version string itself names the fork.
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | gen-version.sh | 8 |
2 files changed, 7 insertions, 3 deletions
@@ -1,6 +1,6 @@ all:: -CGIT_VERSION = v1.3.1 +CGIT_VERSION = v1.3.1-sl0p CGIT_SCRIPT_NAME = cgit.cgi CGIT_SCRIPT_PATH = /var/www/htdocs/cgit CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH) diff --git a/gen-version.sh b/gen-version.sh index 80cf49a..1791488 100755 --- a/gen-version.sh +++ b/gen-version.sh @@ -3,10 +3,14 @@ # Get version-info specified in Makefile V=$1 -# Use `git describe` to get current version if we're inside a git repo +# Use `git describe` to get current version if we're inside a git repo AND it +# yields something. A plain clone of the fork has no tags, so `git describe` +# fails there; don't let that clobber the Makefile-provided version with an +# empty string (which renders as a blank version in the footer/meta). if test "$(git rev-parse --git-dir 2>/dev/null)" = '.git' then - V=$(git describe --abbrev=4 HEAD 2>/dev/null) + D=$(git describe --abbrev=4 HEAD 2>/dev/null) + test -n "$D" && V=$D fi new="CGIT_VERSION = $V" |