master: generate-version.sh: don't assume .git/ layout
luismbo via Sbcl-commits <[email protected]> Fri, 15 May 2026 15:13:24 +0000
| Newsgroups | gmane.lisp.steel-bank.cvs |
|---|---|
| Message-ID | <[email protected]> |
The branch "master" has been updated in SBCL:
via f39348923980ca6ca006bef3e5cca23a5bb04978 (commit)
from 3a7a5218d4f926e211178ed25eb790f5ada88d61 (commit)
- Log -----------------------------------------------------------------
commit f39348923980ca6ca006bef3e5cca23a5bb04978
Author: Luís Borges de Oliveira <[email protected]>
Date: Fri May 15 15:47:09 2026 +0100
generate-version.sh: don't assume .git/ layout
Use git symbolic-ref instead of poking directly at the .git directory.
This way we can handle git worktrees where .git is not a directory.
---
generate-version.sh | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/generate-version.sh b/generate-version.sh
index 9e00aecd0..c7a8f181d 100755
--- a/generate-version.sh
+++ b/generate-version.sh
@@ -38,13 +38,7 @@ EOF
fi
# Build it.
version_head=`git rev-parse HEAD`
-if grep -q "ref: refs/heads/.*" .git/HEAD > /dev/null 2>&1
-then
- version_branchname=`cut -d / -f 3- < .git/HEAD`
-else
- # Detached head.
- version_branchname="HEAD"
-fi
+version_branchname=`git symbolic-ref --short -q HEAD || echo HEAD`
if [ -z "$SBCL_BUILDING_RELEASE_FROM" ]
then
version_root=`git merge-base HEAD origin/master`
-----------------------------------------------------------------------
hooks/post-receive
--
SBCL
_______________________________________________
Sbcl-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/sbcl-commits