From a2d77c457caa5ac22d5eaca47fd391b196099937 Mon Sep 17 00:00:00 2001 From: Daniel Willmann Date: Tue, 24 Jul 2018 17:51:58 +0200 Subject: [PATCH] git-version-gen: Don't check for .git directory This check is not in all our repos that use git-version-gen. Indeed it seems to be a leftover of openbsc where I think it wanted to ensure being called in the openbsc subfolder or something? libosmocore e.g. doesn't have it. In any case .git being a directory is not always true (if using git worktree) so remove this check. Change-Id: I4385cc4fb87ca4354a3c608a18aa3d2eb03a744f --- git-version-gen | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-version-gen b/git-version-gen index 8e59c5af..42cf3d2b 100755 --- a/git-version-gen +++ b/git-version-gen @@ -92,8 +92,8 @@ fi if test -n "$v" then : # use $v -elif test -d ./.git \ - && v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \ +elif + v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \ || git describe --abbrev=4 HEAD 2>/dev/null` \ && case $v in [0-9]*) ;;