diff options
| author | Alex Thiessen <alex.thiessen.de+coreboot@gmail.com> | 2018-01-14 10:38:30 +0000 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2018-01-22 12:32:00 +0000 |
| commit | a90e5ebde43fe22e91ef934151d251b13bef6beb (patch) | |
| tree | b4acd7f11e79f587fb55fea16064accb6e766348 | |
| parent | d1eca65908464d1760db96b0aa3b2b3dbfcc4c4a (diff) | |
Makefile.inc: Improve git worktree check
`Makefile.inc` checks for `.git` to be present under $(top) to define
the value of $GIT. 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: Ifd6da19f13d9f2a9fddb6afd7cb5f16daba2401e
Signed-off-by: Alex Thiessen <alex.thiessen.de+coreboot@gmail.com>
Reviewed-on: https://review.coreboot.org/23254
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>
| -rw-r--r-- | Makefile.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.inc b/Makefile.inc index 4ce74745a9..f91e8d4297 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -14,7 +14,8 @@ ## ifneq ($(NOCOMPILE),1) -GIT:=$(shell [ -e "$(top)/.git" ] && command -v git) +GIT:=$(shell git -C "$(top)" rev-parse --git-dir 1>/dev/null 2>&1 \ + && command -v git) else GIT:= endif |