Skip to content

Commit 6265190

Browse files
Daniel Willmannasdfuser
Daniel Willmann
authored andcommittedJul 24, 2018
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: Ic14561f3b041bb94d1b60e477b18e37077ce4c32
1 parent b3d32cd commit 6265190

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed
 

‎git-version-gen

+2-2
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ fi
9292
if test -n "$v"
9393
then
9494
: # use $v
95-
elif test -d ./.git \
96-
&& v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \
95+
elif
96+
v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \
9797
|| git describe --abbrev=4 HEAD 2>/dev/null` \
9898
&& case $v in
9999
[0-9]*) ;;

0 commit comments

Comments
 (0)
Please sign in to comment.