aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorVasilis Tsiligiannis <b_tsiligiannis@silverton.gr>2016-04-13 20:52:26 +0000
committerVasilis Tsiligiannis <b_tsiligiannis@silverton.gr>2016-04-13 20:52:26 +0000
commit2d10f84f1b81fd7d317d55e3da71ddf5f943c223 (patch)
treefd226d97118d1fa230f66c4e7deb1fde2a3159e9 /scripts
parent7f0dd31b6834746e0f4153a21b364cd8f2221570 (diff)
downloadmaster-187ad058-2d10f84f1b81fd7d317d55e3da71ddf5f943c223.tar.gz
master-187ad058-2d10f84f1b81fd7d317d55e3da71ddf5f943c223.tar.bz2
master-187ad058-2d10f84f1b81fd7d317d55e3da71ddf5f943c223.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> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@49165 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'scripts')
-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" ]