diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-07-18 12:20:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-18 12:20:35 -0700 |
| commit | 5571d085b3c9c2aa9470a10bcf2b8518d3e4ec99 (patch) | |
| tree | 5f1fc694b5ba489621b27cc34a6373e6110d5faa | |
| parent | bedb9145510240a48cfb2a9a28abf0f66683a941 (diff) | |
| parent | 5cf8e064747be2026bb23be37f84f2f0b2a31781 (diff) | |
Merge branch 'js/enhanced-version-info'
Build fix.
* js/enhanced-version-info:
Makefile: fix the "built from commit" code
| -rw-r--r-- | Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -2021,8 +2021,9 @@ version.sp version.s version.o: GIT-VERSION-FILE GIT-USER-AGENT version.sp version.s version.o: EXTRA_CPPFLAGS = \ '-DGIT_VERSION="$(GIT_VERSION)"' \ '-DGIT_USER_AGENT=$(GIT_USER_AGENT_CQ_SQ)' \ - '-DGIT_BUILT_FROM_COMMIT="$(shell GIT_CEILING_DIRECTORIES=\"$(CURDIR)/..\" \ - git rev-parse -q --verify HEAD || :)"' + '-DGIT_BUILT_FROM_COMMIT="$(shell \ + GIT_CEILING_DIRECTORIES="$(CURDIR)/.." \ + git rev-parse -q --verify HEAD 2>/dev/null)"' $(BUILT_INS): git$X $(QUIET_BUILT_IN)$(RM) $@ && \ |