summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorAlex Thiessen <alex.thiessen.de+coreboot@gmail.com>2018-01-13 16:31:28 +0000
committerMartin Roth <martinroth@google.com>2018-01-17 16:54:22 +0000
commitda384dd7a4eea2fc4153c593026489cee5585895 (patch)
tree3fadfdbbfd4eecf08dc7e0346e87de1a8bb81416 /util
parent7d3f23ac4854b2e13b5d5d3ad078a8a56892a43e (diff)
util/release: Improve git worktree checks
The bash script `genrelnotes` checks for `.git` to be present to determine whether the current directory is the top directory of a git worktree. This check is rather weak and doesn't handle many edge cases like that of a broken gitfile. Add a proper `git rev-parse` call to check the condition. Change-Id: I32b06ca982d55fd8e88e55651b6bc53014905823 Signed-off-by: Alex Thiessen <alex.thiessen.de+coreboot@gmail.com> Reviewed-on: https://review.coreboot.org/23252 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'util')
-rwxr-xr-xutil/release/genrelnotes3
1 files changed, 2 insertions, 1 deletions
diff --git a/util/release/genrelnotes b/util/release/genrelnotes
index 504eda4362..9db86317dc 100755
--- a/util/release/genrelnotes
+++ b/util/release/genrelnotes
@@ -32,7 +32,8 @@ then
exit 1
fi
-if [ ! -e ".git" ];then
+if ! { cdup="$(git rev-parse --show-cdup 2>/dev/null)" && [ -z "${cdup}" ]; }
+then
echo "ERROR: This is not the top directory of a git repo. Exiting."
exit 1
fi