Merge branch 'maint-0.2.9' into release-0.2.9
This commit is contained in:
commit
5032489e80
|
@ -0,0 +1,4 @@
|
||||||
|
o Minor bugfix (build):
|
||||||
|
- The current Git revision when building from a local repository is now
|
||||||
|
detected correctly when using git worktrees. Fixes bug 20492; bugfix on
|
||||||
|
0.2.3.9-alpha.
|
|
@ -198,7 +198,7 @@ noinst_HEADERS+= $(ORHEADERS) micro-revision.i
|
||||||
|
|
||||||
micro-revision.i: FORCE
|
micro-revision.i: FORCE
|
||||||
$(AM_V_at)rm -f micro-revision.tmp; \
|
$(AM_V_at)rm -f micro-revision.tmp; \
|
||||||
if test -d "$(top_srcdir)/.git" && \
|
if test -r "$(top_srcdir)/.git" && \
|
||||||
test -x "`which git 2>&1;true`"; then \
|
test -x "`which git 2>&1;true`"; then \
|
||||||
HASH="`cd "$(top_srcdir)" && git rev-parse --short=16 HEAD`"; \
|
HASH="`cd "$(top_srcdir)" && git rev-parse --short=16 HEAD`"; \
|
||||||
echo \"$$HASH\" > micro-revision.tmp; \
|
echo \"$$HASH\" > micro-revision.tmp; \
|
||||||
|
|
Loading…
Reference in New Issue