From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 25 Feb 2026 19:54:18 +0000 (-0800)
Subject: Merge branch 'mc/tr2-process-ancestry-cleanup'
X-Git-Tag: v2.54.0-rc0~162
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=422cae66878b8152453fe89c179dddbe1413cf56;p=thirdparty%2Fgit.git

Merge branch 'mc/tr2-process-ancestry-cleanup'

Add process ancestry data to trace2 on macOS to match what we
already do on Linux and Windows.  Also adjust the way Windows
implementation reports this information to match the other two.

* mc/tr2-process-ancestry-cleanup:
  t0213: add trace2 cmd_ancestry tests
  test-tool: extend trace2 helper with 400ancestry
  trace2: emit cmd_ancestry data for Windows
  trace2: refactor Windows process ancestry trace2 event
  build: include procinfo.c impl for macOS
  trace2: add macOS process ancestry tracing
---

422cae66878b8152453fe89c179dddbe1413cf56
diff --cc config.mak.uname
index 3c35ae33a3,baa5018461..5feb582558
--- a/config.mak.uname
+++ b/config.mak.uname
@@@ -149,15 -148,31 +149,17 @@@ ifeq ($(uname_S),Darwin
  	HAVE_NS_GET_EXECUTABLE_PATH = YesPlease
  	CSPRNG_METHOD = arc4random
  	USE_ENHANCED_BASIC_REGULAR_EXPRESSIONS = YesPlease
+ 	HAVE_PLATFORM_PROCINFO = YesPlease
+ 	COMPAT_OBJS += compat/darwin/procinfo.o
  
 -	# Workaround for `gettext` being keg-only and not even being linked via
 -	# `brew link --force gettext`, should be obsolete as of
 -	# https://github.com/Homebrew/homebrew-core/pull/53489
 -        ifeq ($(shell test -d /usr/local/opt/gettext/ && echo y),y)
 -		BASIC_CFLAGS += -I/usr/local/include -I/usr/local/opt/gettext/include
 -		BASIC_LDFLAGS += -L/usr/local/lib -L/usr/local/opt/gettext/lib
 -                ifeq ($(shell test -x /usr/local/opt/gettext/bin/msgfmt && echo y),y)
 -			MSGFMT = /usr/local/opt/gettext/bin/msgfmt
 -                endif
 -	# On newer ARM-based machines the default installation path has changed to
 -	# /opt/homebrew. Include it in our search paths so that the user does not
 -	# have to configure this manually.
 -	#
 -	# Note that we do not employ the same workaround as above where we manually
 -	# add gettext. The issue was fixed more than three years ago by now, and at
 -	# that point there haven't been any ARM-based Macs yet.
 -        else ifeq ($(shell test -d /opt/homebrew/ && echo y),y)
 -		BASIC_CFLAGS += -I/opt/homebrew/include
 -		BASIC_LDFLAGS += -L/opt/homebrew/lib
 -                ifeq ($(shell test -x /opt/homebrew/bin/msgfmt && echo y),y)
 -			MSGFMT = /opt/homebrew/bin/msgfmt
 -                endif
 +        ifeq ($(uname_M),arm64)
 +		HOMEBREW_PREFIX = /opt/homebrew
 +        else
 +		HOMEBREW_PREFIX = /usr/local
 +        endif
 +        ifeq ($(shell test "$(DARWIN_MAJOR_VERSION)" -ge 24 && echo 1),1)
 +		USE_HOMEBREW_LIBICONV = UnfortunatelyYes
 +		NEEDS_GOOD_LIBICONV = UnfortunatelyYes
          endif
  
  	# The builtin FSMonitor on MacOS builds upon Simple-IPC.  Both require