Change in osmo-msc[master]: git-version-gen: Don't check for .git directory

[daniel]

daniel has uploaded this change for review. ( https://gerrit.osmocom.org/10141


Change subject: git-version-gen: Don't check for .git directory
......................................................................

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: I9d895fa90991d47e9626a8e7fa701540b658194c
---
M git-version-gen
1 file changed, 2 insertions(+), 2 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/41/10141/1

diff --git a/git-version-gen b/git-version-gen
index 8e59c5a..42cf3d2 100755
--- a/git-version-gen
+++ b/git-version-gen
@@ -92,8 +92,8 @@
 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]*) ;;

-- 
To view, visit https://gerrit.osmocom.org/10141
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9d895fa90991d47e9626a8e7fa701540b658194c
Gerrit-Change-Number: 10141
Gerrit-PatchSet: 1
Gerrit-Owner: daniel <dwillmann at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180724/fd86dd1a/attachment.htm>