From 7d4a3185c95a5a83ca8487aef5b0ea673307ea9d Mon Sep 17 00:00:00 2001 From: Will Andrews Date: Sun, 1 Jul 2018 01:09:52 +0000 Subject: [PATCH] beinstall: enable use with git worktrees. --- tools/build/beinstall.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/build/beinstall.sh b/tools/build/beinstall.sh index 94b25c59af2..a24fc2ad778 100755 --- a/tools/build/beinstall.sh +++ b/tools/build/beinstall.sh @@ -101,7 +101,8 @@ trap 'errx "Interrupt caught"' HUP INT TERM objdir=$(make -V .OBJDIR 2>/dev/null) [ ! -d "${objdir}" ] && errx "Must have built FreeBSD from source tree" -if [ -d .git ] ; then +# May be a worktree, in which case .git is a file, not a directory. +if [ -e .git ] ; then commit_time=$(git show --format='%ct' 2>/dev/null | head -1) [ $? -ne 0 ] && errx "Can't lookup git commit timestamp" commit_ts=$(date -r ${commit_time} '+%Y%m%d.%H%M%S')