From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 12 May 2025 21:22:50 +0000 (-0700)
Subject: Merge branch 'ps/meson-bin-sh'
X-Git-Tag: v2.50.0-rc0~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8cc1a9acdc9e25e0b7049299109689a9dcfe866;p=thirdparty%2Fgit.git

Merge branch 'ps/meson-bin-sh'

Meson-based build framework update.

* ps/meson-bin-sh:
  meson: prefer shell at "/bin/sh"
  meson: report detected runtime executable paths
---

b8cc1a9acdc9e25e0b7049299109689a9dcfe866
diff --cc meson.build
index 270ce933d0,6a90310a2c..148ae668eb
--- a/meson.build
+++ b/meson.build
@@@ -241,9 -235,12 +241,13 @@@ git = find_program('git', dirs: program
  sed = find_program('sed', dirs: program_path, native: true)
  shell = find_program('sh', dirs: program_path, native: true)
  tar = find_program('tar', dirs: program_path, native: true)
 +time = find_program('time', dirs: program_path, required: get_option('benchmarks'))
  
- target_shell = find_program('sh', dirs: program_path, native: false)
+ # Detect the target shell that is used by Git at runtime. Note that we prefer
+ # "/bin/sh" over a PATH-based lookup, which provides a working shell on most
+ # supported systems. This path is also the default shell path used by our
+ # Makefile. This lookup can be overridden via `program_path`.
+ target_shell = find_program('sh', dirs: program_path + [ '/bin' ], native: false)
  
  # Sanity-check that programs required for the build exist.
  foreach tool : ['cat', 'cut', 'grep', 'sort', 'tr', 'uname']