Skip to content

Commit e21ecc1

Browse files
committed
---
yaml --- r: 83815 b: refs/heads/try c: 4fd7f85 h: refs/heads/master i: 83813: 4967e9a 83811: a85ec34 83807: cb22c89 v: v3
1 parent 53e41ff commit e21ecc1

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 0e4d1fc8cae42e15e00f71d9f439b01bb25a86ae
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 6c08cc2db4f98e9f07ae7d50338396c4123c2f0a
5-
refs/heads/try: 2e64a718ea7db51f79a46441907bf659cb761e9c
5+
refs/heads/try: 4fd7f852e131ad8c9935fd9577c071be5b4635ec
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/Makefile.in

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,11 +147,17 @@ CFG_VERSION = $(CFG_RELEASE)
147147
# numbers and dots here
148148
CFG_VERSION_WIN = 0.9
149149

150-
ifneq ($(wildcard $(CFG_GIT)),)
151-
ifneq ($(wildcard $(CFG_GIT_DIR)),)
152-
CFG_VERSION += $(shell git --git-dir=$(CFG_GIT_DIR) log -1 \
150+
# since $(CFG_GIT) may contain spaces (especially on Windows),
151+
# we need to escape them. (" " to r"\ ")
152+
# Note that $(subst ...) ignores space after `subst`,
153+
# so we use a hack: define $(SPACE) which contains space character.
154+
SPACE :=
155+
SPACE +=
156+
ifneq ($(wildcard $(subst $(SPACE),\$(SPACE),$(CFG_GIT))),)
157+
ifneq ($(wildcard $(subst $(SPACE),\$(SPACE),$(CFG_GIT_DIR))),)
158+
CFG_VERSION += $(shell git --git-dir='$(CFG_GIT_DIR)' log -1 \
153159
--pretty=format:'(%h %ci)')
154-
CFG_VER_HASH = $(shell git --git-dir=$(CFG_GIT_DIR) rev-parse HEAD)
160+
CFG_VER_HASH = $(shell git --git-dir='$(CFG_GIT_DIR)' rev-parse HEAD)
155161
endif
156162
endif
157163

0 commit comments

Comments
 (0)