aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVasilis Tsiligiannis <acinonyx@openwrt.gr>2016-04-13 20:52:26 +0000
committerVasilis Tsiligiannis <acinonyx@openwrt.gr>2016-04-13 20:52:26 +0000
commitb09848cd25e7e1757e15aeb7e7d7ad699aa76f9d (patch)
tree182007d8d67c1d14207d0b85a063d4f143e2dcfe
parentd55512075b368ef060eae5f41b946a96936d1ceb (diff)
downloadupstream-b09848cd25e7e1757e15aeb7e7d7ad699aa76f9d.tar.gz
upstream-b09848cd25e7e1757e15aeb7e7d7ad699aa76f9d.tar.bz2
upstream-b09848cd25e7e1757e15aeb7e7d7ad699aa76f9d.zip
scripts/getver.sh: Use 'git-rev-parse' to detect if tree lies in Git repository
Path to the Git repository directory can be overriden by using the '$GIT_DIR' environment variable. This patch improves detection of Git repository by using 'git-rev-parse', which respects '$GIT_DIR' environment variable, instead of just checking the existence of '.git' directory. Signed-off-by: Vasilis Tsiligiannis <acinonyx@openwrt.gr> SVN-Revision: 49165
-rwxr-xr-xscripts/getver.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/getver.sh b/scripts/getver.sh
index 4643ca63ff..6cf7797519 100755
--- a/scripts/getver.sh
+++ b/scripts/getver.sh
@@ -17,7 +17,7 @@ try_svn() {
}
try_git() {
- [ -e .git ] || return 1
+ git rev-parse --git-dir >/dev/null 2>&1 || return 1
REV="$(git log | grep -m 1 git-svn-id | awk '{ gsub(/.*@/, "", $0); print $1 }')"
REV="${REV:+r$REV}"
[ -n "$REV" ]