nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.2.9'

Browse Source
This commit is contained in:
Nick Mathewson 2016-12-05 08:21:46 -05:00
commit 0ded72322c
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/20492 Normal file
View File

@ -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.

2
src/or/include.am
View File

@ -206,7 +206,7 @@ noinst_HEADERS+= $(ORHEADERS) micro-revision.i
micro-revision.i: FORCE
$(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 \
HASH="`cd "$(top_srcdir)" && git rev-parse --short=16 HEAD`"; \
echo \"$$HASH\" > micro-revision.tmp; \