From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 28 Dec 2017 22:08:47 +0000 (-0800)
Subject: Merge branch 'js/enhanced-version-info'
X-Git-Tag: v2.16.0-rc0~11
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/58d1772c8562c4777414d9b97de127ae5b35ad81?ds=inline;hp=-c

Merge branch 'js/enhanced-version-info'

"git version --build-options" learned to report the host CPU and
the exact commit object name the binary was built from.

* js/enhanced-version-info:
version --build-options: report commit, too, if possible
version --build-options: also report host CPU
---

58d1772c8562c4777414d9b97de127ae5b35ad81
diff --combined Makefile
index 32c170687c,2ce70d205d..2a81ae22e9
--- a/Makefile
+++ b/Makefile
@@@ -425,6 -425,9 +425,9 @@@ all:
  #
  # to say "export LESS=FRX (and LV=-c) if the environment variable
  # LESS (and LV) is not set, respectively".
+ #
+ # When cross-compiling, define HOST_CPU as the canonical name of the CPU on
+ # which the built Git will run (for instance "x86_64").
  
  GIT-VERSION-FILE: FORCE
  	@$(SHELL_PATH) ./GIT-VERSION-GEN
@@@ -651,7 -654,6 +654,7 @@@ TEST_PROGRAMS_NEED_X += test-dump-cache
  TEST_PROGRAMS_NEED_X += test-dump-fsmonitor
  TEST_PROGRAMS_NEED_X += test-dump-split-index
  TEST_PROGRAMS_NEED_X += test-dump-untracked-cache
 +TEST_PROGRAMS_NEED_X += test-example-decorate
  TEST_PROGRAMS_NEED_X += test-fake-ssh
  TEST_PROGRAMS_NEED_X += test-genrandom
  TEST_PROGRAMS_NEED_X += test-hashmap
@@@ -760,7 -762,6 +763,7 @@@ LIB_OBJS += branch.
  LIB_OBJS += bulk-checkin.o
  LIB_OBJS += bundle.o
  LIB_OBJS += cache-tree.o
 +LIB_OBJS += checkout.o
  LIB_OBJS += color.o
  LIB_OBJS += column.o
  LIB_OBJS += combine-diff.o
@@@ -812,8 -813,6 +815,8 @@@ LIB_OBJS += levenshtein.
  LIB_OBJS += line-log.o
  LIB_OBJS += line-range.o
  LIB_OBJS += list-objects.o
 +LIB_OBJS += list-objects-filter.o
 +LIB_OBJS += list-objects-filter-options.o
  LIB_OBJS += ll-merge.o
  LIB_OBJS += lockfile.o
  LIB_OBJS += log-tree.o
@@@ -1099,6 -1098,12 +1102,12 @@@ els
  BROKEN_PATH_FIX = '/^\# @@BROKEN_PATH_FIX@@$$/d'
  endif
  
+ ifeq (,$(HOST_CPU))
+ 	BASIC_CFLAGS += -DGIT_HOST_CPU="\"$(firstword $(subst -, ,$(uname_M)))\""
+ else
+ 	BASIC_CFLAGS += -DGIT_HOST_CPU="\"$(HOST_CPU)\""
+ endif
+ 
  ifneq (,$(INLINE))
  	BASIC_CFLAGS += -Dinline=$(INLINE)
  endif
@@@ -1897,7 -1902,9 +1906,9 @@@ builtin/help.sp builtin/help.s builtin/
  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_USER_AGENT=$(GIT_USER_AGENT_CQ_SQ)' \
+ 	'-DGIT_BUILT_FROM_COMMIT="$(shell GIT_CEILING_DIRECTORIES=\"$(CURDIR)/..\" \
+ 		git rev-parse -q --verify HEAD || :)"'
  
  $(BUILT_INS): git$X
  	$(QUIET_BUILT_IN)$(RM) $@ && \