Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/lavabit/magma.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLadar Levison <ladar@lavabit.com>2018-09-04 16:51:37 +0300
committerLadar Levison <ladar@lavabit.com>2018-09-04 16:51:37 +0300
commit43de3f4674d40392d2acc1e664dc3b9614baba32 (patch)
tree8b6fc4557d622874ed14cf211ddeda4651c7d29c /Makefile
parent65b7bd1404314c2b5e55e380d0846b59d27d1534 (diff)
Fixed the patch level calculation logic.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index a7d45a3b..b03d4394 100644
--- a/Makefile
+++ b/Makefile
@@ -190,7 +190,7 @@ ifneq ($(strip $(MAGMA_REPO)),1)
MAGMA_COMMIT := "NONE"
else
# Add the --since='YYYY/MM/DD' or --since='TAG' to the git log command below to reset the patch version to 0.
- MAGMA_VERSION := $(PACKAGE_VERSION).$(shell git log --since='v7.0.0' --format='%H' | wc -l)
+ MAGMA_VERSION := $(PACKAGE_VERSION).$(shell git log `git log -n 1 v7.0.0 --pretty='%H'`..`git log --pretty='%H'` --format='%H' | wc -l)
MAGMA_COMMIT := $(shell git log --format="%H" -n 1 | cut -c33-40)
endif