From: Harald Hoyer Date: Thu, 16 Aug 2018 08:46:57 +0000 (+0200) Subject: travis: git pull more depth X-Git-Tag: 049~45 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ae584824519995219857ca7f447e73f31a6da9a;p=thirdparty%2Fdracut.git travis: git pull more depth --- diff --git a/.travis.yml b/.travis.yml index 01be428f9..2df45f4d8 100644 --- 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 cd02dab0b..806234371 100644 --- 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