travis: git pull more depth

diff --git a/.travis.yml b/.travis.yml
index 01be428f93573ca15dbb69810ff3caa993d215e9..2df45f4d8197fd2a84a6713c7ebfa8c6668573cb 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ env:
 
 before_script:
   - docker pull fedora:$IMAGE
-  - git pull --tags
+  - git pull --depth=100
   - |
     git describe --abbrev=0 --tags || :
     git describe --tags || :

diff --git a/Makefile b/Makefile
index cd02dab0bf061e0f5105541cd12125eb0d3881a5..80623437153b37e97689fa9c4a809788112f92a0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 -include dracut-version.sh
 
-VERSION ?= $(shell [ -d .git ] && git describe --abbrev=0 --tags 2>/dev/null || echo $(DRACUT_VERSION))
-GITVERSION ?= $(shell [ -d .git ] && { v=$$(git describe --tags 2>/dev/null); [ -n "$$v" ] && [ $${v\#*-} != $$v ] && echo -$${v\#*-}; } )
+VERSION ?= $(shell [ -d .git ] && git describe --abbrev=0 --tags --always 2>/dev/null || echo $(DRACUT_VERSION))
+GITVERSION ?= $(shell [ -d .git ] && { v=$$(git describe --tags --always 2>/dev/null); [ -n "$$v" ] && [ $${v\#*-} != $$v ] && echo -$${v\#*-}; } )
 
 -include Makefile.inc